Merge branch 'master' into develop

This commit is contained in:
Michael Mandl 2019-01-30 21:42:38 +01:00
commit d59176afdf

View file

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