| commit | fadb47884308490085a33d3fb1e857a0f5e5d748 | |
| author | Waldemar Brodkorb <wbx@openadk.org> | |
| Mon, 8 Feb 2010 23:27:59 +0000 (9 00:27 +0100) | ||
| committer | Waldemar Brodkorb <wbx@openadk.org> | |
| Mon, 8 Feb 2010 23:27:59 +0000 (9 00:27 +0100) | ||
| tree | b78955b59ae121e50753c0d09e5e298c8ccf05cf | treesnapshot (tar.gz zip) |
| parent | 91e7244abc54001dc7b1063cd1b9818d46128bba | commitdiff |
| parent | a619c16fa72c3c15a198b452e512a08f18251930 | commitdiff |
resolve conflict
| scripts/cpio | diff1 | diff2 | blobhistory |
| scripts/tarpkg | diff1 | diff2 | blobhistory |