diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-04 13:53:08 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2013-11-04 13:53:08 +0100 |
| commit | 8b3dac771af71587d791d7a8171c2b4036afea10 (patch) | |
| tree | 644c0eebc8cc73d56bfef111d711b4b0028ad97a /mk | |
| parent | 22e24d73762b2cfc79797f94d9e2d9e3f070c418 (diff) | |
resolve merge conflict, second try
Diffstat (limited to 'mk')
0 files changed, 0 insertions, 0 deletions