summaryrefslogtreecommitdiffstats
path: root/Include/patchlevel.h
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2013-04-06 14:00:24 (GMT)
committerBenjamin Peterson <benjamin@python.org>2013-04-06 14:00:24 (GMT)
commit9db034161ea7d9ab47ffbb00344221078b0ed3a5 (patch)
tree44b0a0594ac16b1b5ce916abd32d10e382b1c9f5 /Include/patchlevel.h
parent76794131de87c33e8d80e899d30f4fd705e1693a (diff)
parent7bcb2d573bfa315be2d14c10e06da5bd41e48ebc (diff)
downloadcpython-9db034161ea7d9ab47ffbb00344221078b0ed3a5.zip
cpython-9db034161ea7d9ab47ffbb00344221078b0ed3a5.tar.gz
cpython-9db034161ea7d9ab47ffbb00344221078b0ed3a5.tar.bz2
merge 2.7.4 release branch
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 7d6952e..6b5e566 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,11 +23,11 @@
#define PY_MAJOR_VERSION 2
#define PY_MINOR_VERSION 7
#define PY_MICRO_VERSION 4
-#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 "2.7.4rc1+"
+#define PY_VERSION "2.7.4"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository). Empty