summaryrefslogtreecommitdiff
path: root/version.h
diff options
context:
space:
mode:
authorBent Bisballe Nyeng <deva@aasimon.org>2016-01-20 22:08:11 +0100
committerBent Bisballe Nyeng <deva@aasimon.org>2016-01-20 22:08:11 +0100
commite92be2c5fb50736b0b4cd4729fea31f6289c15ed (patch)
tree08aca318856117a95a1d6327cdcb882ca1e5a6c2 /version.h
parentc172d3a1047f9b4f2e5cd93bf0008e248cd402e9 (diff)
parent14d3bed63b3e51439fbf3632b470729846ca6913 (diff)
fix merge conflicts.
Diffstat (limited to 'version.h')
0 files changed, 0 insertions, 0 deletions