Merge remote-tracking branch 'svn/trunk' into git_master

This commit is contained in:
Diederick C. Niehorster 2019-09-27 19:02:30 +02:00
commit ef2b555342

View File

@ -19,7 +19,7 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
# TODO: Update these for each release! # TODO: Update these for each release!
set(VERSION_MAJOR 3) set(VERSION_MAJOR 3)
set(VERSION_MINOR 2) set(VERSION_MINOR 2)
set(VERSION_PATCH 0) set(VERSION_PATCH 1)
set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}) set(VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
# Update fg_version.h to match the versions number here in cmake # Update fg_version.h to match the versions number here in cmake