Merge branch 'master' into develop

This commit is contained in:
Michael Mandl 2019-02-17 17:33:59 +01:00
commit bb06f17de0

View file

@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.6) cmake_minimum_required(VERSION 3.6)
set(BUILD_VERSION_MAJOR_MINOR 0.5) set(BUILD_VERSION_MAJOR_MINOR 0.6)
if ($ENV{BUILD_NUMBER}) if ($ENV{BUILD_NUMBER})
set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER}) set(BUILD_VERSION_PATCH $ENV{BUILD_NUMBER})