Merge branch 'master' of https://github.com/grodansparadis/vscp_software

grodansparadis · Apr 15, 2016 · 3e7af88 · 3e7af88
2 parents d59b289 + 4b06bb9
commit 3e7af88
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/vscp/common/version.h b/src/vscp/common/version.h
@@ -26,10 +26,10 @@
 
 #define VSCPD_MAJOR_VERSION     1
 #define VSCPD_MINOR_VERSION     12
-#define VSCPD_SUB_VERSION       1
-#define VSCPD_BUILD_VERSION     3
+#define VSCPD_SUB_VERSION       2
+#define VSCPD_BUILD_VERSION     0
 
-#define VSCPD_DISPLAY_VERSION "1.12.1.3 Magnesium"
+#define VSCPD_DISPLAY_VERSION "1.12.2.0 Magnesium"
 
 #define VSCPD_COPYRIGHT "Copyright (C) 2000-2016, Grodans Paradis AB, http://www.paradiseofthefrog.com"
 #define VSCPD_COPYRIGHT_HTML "Copyright (C) 2000-2016, <a href=\"mailto:[email protected]\">Paradise of the Frog</a>, <a href=\"http://www.paradiseofthefrog.com\">http://www.paradiseofthefrog.com</a>"