| commit | 94c763109f74b446e4d5d31e55ef337c8c8d86cb | |
| author | Waldemar Brodkorb <wbx@openadk.org> | |
| Mon, 10 Jan 2011 10:03:58 +0000 (10 11:03 +0100) | ||
| committer | Waldemar Brodkorb <wbx@openadk.org> | |
| Mon, 10 Jan 2011 10:03:58 +0000 (10 11:03 +0100) | ||
| tree | 22d1cd06809f5a5c11241e998d9ead4010ac3c91 | treesnapshot (tar.gz zip) |
| parent | a217fc80b29080dae963bb15051df023de36ce39 | commitdiff |
| parent | 16d94117a716fc361d3db9a2a17cf4c45eab837d | commitdiff |
resolve conflicts