Merge remote-tracking branch 'upstream/master' into master_PKGBUILD

diff --git a/CHANGES b/CHANGES
index b574d2c01a6b21ce91940e3889b7748fcbfda9ed..e52c3bb31e4e9ee21486ac3f88802d0d50cca9a3 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Release v0.3.0
+2013-08-20 v0.3.0
     * Language:
         - Return assignments, the ability to assign to the return keyword
           as if it were a local variable.

diff --git a/gmqcc.h b/gmqcc.h
index fcf7d836c8e94a55f70c92456e1015f9c86da26d..ff74f45163d098c4e33c1f4684b32201ac7dae5c 100644 (file)
--- a/gmqcc.h
+++ b/gmqcc.h
@@ -41,7 +41,7 @@
 #define GMQCC_VERSION \
     GMQCC_VERSION_BUILD(GMQCC_VERSION_MAJOR, GMQCC_VERSION_MINOR, GMQCC_VERSION_PATCH)
 /* Undefine the following on a release-tag: */
-#define GMQCC_VERSION_TYPE_DEVEL
+/*#define GMQCC_VERSION_TYPE_DEVEL*/
 
 /* Full version string in case we need it */
 #ifdef GMQCC_VERSION_TYPE_DEVEL