Merge branch 'develop'

etternagame · Nov 12, 2018 · d9d9722 · d9d9722
2 parents b984fe4 + 4d2d6da
commit d9d9722
Show file tree

Hide file tree

Showing 141 changed files with 3,545 additions and 2,076 deletions.
diff --git a/CMake/SMDefs.cmake b/CMake/SMDefs.cmake
@@ -1,6 +1,6 @@
 # Set up version numbers according to the new scheme.
 set(SM_VERSION_MAJOR 0)
-set(SM_VERSION_MINOR 61)
+set(SM_VERSION_MINOR 62)
 set(SM_VERSION_PATCH 0)
 set(SM_VERSION_TRADITIONAL "${SM_VERSION_MAJOR}.${SM_VERSION_MINOR}.${SM_VERSION_PATCH}")
 

diff --git a/Data/splash.png b/Data/splash.png