Merge branch 'master' into stable_fixes

junghans · junghans · commit 7ec34ee04de4 · 2019-12-19T06:38:02.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,5 +2,5 @@ cmake_minimum_required(VERSION 3.1)
 
 project(xtp-tutorials)
 
-set(PROJECT_VERSION "1.6_rc1")
+set(PROJECT_VERSION "1.7-dev")
 

Original file line number	Diff line number	Diff line change
`@@ -2,5 +2,5 @@ cmake_minimum_required(VERSION 3.1)`
`2`	`2`
`3`	`3`	`project(xtp-tutorials)`
`4`	`4`
`5`		`-set(PROJECT_VERSION "1.6_rc1")`
	`5`	`+set(PROJECT_VERSION "1.7-dev")`
`6`	`6`