Merge branch 'release/release-1.2' into develop

[reservoir_sample] / version.h

diff --git a/version.h b/version.h
index 6e3e3a59e49613b14beb1ecf702d35fb01600991..9191a862a793703416ef169862de9f6c63c908f4 100644 (file)
--- a/version.h
+++ b/version.h
@@ -2,9 +2,9 @@
 #define VERSION_H
 
 #define VERSION_MAJOR 1
-#define VERSION_MINOR 1
+#define VERSION_MINOR 2
 #define VERSION_EXTRA_STR ""
-#define VERSION_STR "1.1"
-#define VERSION_DATE  "2013-02-19"
+#define VERSION_STR "1.2"
+#define VERSION_DATE  "2013-02-22"
 
 #endif