From: Justin Wind <justin.wind@gmail.com>
Date: Fri, 22 Feb 2013 02:38:28 +0000 (-0800)
Subject: Merge branch 'release/release-1.2' into develop
X-Git-Url: http://git.squeep.com/?p=reservoir_sample;a=commitdiff_plain;h=16dc56664a14a91ee61fdf1a50280b6e270b66e2;hp=c0224807bccbd7e71e312fb4151378bff4f5a5db

Merge branch 'release/release-1.2' into develop
---

diff --git a/version.h b/version.h
index 6e3e3a5..9191a86 100644
--- 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