Futuray-pgm
/
voxelands
forked from oerkki/voxelands
1
1
Fork 0
Code Pull Requests Activity

redo the automatic next version number

This commit is contained in:
Menche 2016-08-27 18:00:29 -07:00 committed by darkrose
parent 760b39dab0
commit e94f9fd3dd
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -119,7 +119,11 @@ add_subdirectory(src)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The Fun-Focused Free Software Voxel World Game")
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
<<<<<<< 760b39dab09e6d20dcdc09c555b8eae86ed6ce3c
set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
=======
set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MINOR})
>>>>>>> redo the automatic next version number
set(CPACK_PACKAGE_VENDOR "darkrose")
set(CPACK_PACKAGE_CONTACT "Lisa 'darkrose' Milne <lisa@ltmnet.com>")