Commit Graph

2 Commits

Author SHA1 Message Date
b29cda10a2 Merge branch '2.0' into 2.1 2017-06-20 10:45:02 +03:00
ce8d712b46 Add version to VERSION.cmake filename
The VERSION.cmake file now includes the major and minor versions in the
filename. This will prevent merge conflicts when merging changes upstream.
2017-06-15 10:13:19 +03:00