diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:23:27 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-08-15 12:23:27 +0200 |
| commit | e31e53467bb18e83a01b60881adf35fa8a54531d (patch) | |
| tree | 83272e7c4afeca0b4c1cf009678a12d1751e09f0 /Makefile | |
| parent | c228dba74d4b4536721f9537ad67ac70fd57afe0 (diff) | |
| parent | 6ac888a1e388ebd5e92f957b2c77f326ab197765 (diff) | |
fix merge conflict
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions