Commit Graph

2 Commits

Author SHA1 Message Date
Fedor Isakov c072097fb6 Ensure no conflicts in build.xml -- employ "ours" strategy. 2019-08-22 15:15:28 +02:00
Fedor Isakov 5a7fb3a15e Initial import 2014-07-03 15:02:07 +02:00