summaryrefslogtreecommitdiffstats
path: root/Include/patchlevel.h
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2014-03-17 06:01:31 (GMT)
committerLarry Hastings <larry@hastings.org>2014-03-17 06:01:31 (GMT)
commit8dc931037b472931f2a96b8525bced6d6d0dc791 (patch)
tree61f67707d6b30ae9443b92f3bb0dc41d9aaaefc4 /Include/patchlevel.h
parent2221f666eba4a6f46f2095a801bc3e4bdbdb97d2 (diff)
parent3c5c56f3c068bc13daea2275b951113b43a91e85 (diff)
downloadcpython-8dc931037b472931f2a96b8525bced6d6d0dc791.zip
cpython-8dc931037b472931f2a96b8525bced6d6d0dc791.tar.gz
cpython-8dc931037b472931f2a96b8525bced6d6d0dc791.tar.bz2
Merge from 3.4 into default.
Diffstat (limited to 'Include/patchlevel.h')
-rw-r--r--Include/patchlevel.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 4e4265c..72f540d 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -19,11 +19,11 @@
#define PY_MAJOR_VERSION 3
#define PY_MINOR_VERSION 4
#define PY_MICRO_VERSION 0
-#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_GAMMA
-#define PY_RELEASE_SERIAL 1
+#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_FINAL
+#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "3.4.0rc1+"
+#define PY_VERSION "3.4.0+"
/*--end constants--*/
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.