| commit | 4dc2822fa71e8e3d3ab004c8c14867607bb4de06 | |
| author | Waldemar Brodkorb <wbx@openadk.org> | |
| Wed, 21 Apr 2010 18:57:35 +0000 (21 20:57 +0200) | ||
| committer | Waldemar Brodkorb <wbx@openadk.org> | |
| Wed, 21 Apr 2010 18:57:35 +0000 (21 20:57 +0200) | ||
| tree | 21e5b36849ea23f526cc58578a540de3882d7376 | treesnapshot (tar.gz zip) |
| parent | 8f1eff09d5706cbea36ddf1bfc4661579f688853 | commitdiff |
| parent | 38910b0bc0393c60da90e1b2540e3d4c5858dae9 | commitdiff |
resolve merge conflict
| package/busybox/Makefile | diff1 | diff2 | blobhistory |