summaryrefslogtreecommitdiffstats
path: root/Include
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2001-08-22 19:24:42 (GMT)
committerBarry Warsaw <barry@python.org>2001-08-22 19:24:42 (GMT)
commit60f018846d7b97eec71675c3a1c9e7a058232c73 (patch)
tree0d064457b57af01ca24f65db0ca1e42f68ec75eb /Include
parent0f10f84028c9744b6b1f709ff6217c5c9b07ab89 (diff)
downloadcpython-60f018846d7b97eec71675c3a1c9e7a058232c73.zip
cpython-60f018846d7b97eec71675c3a1c9e7a058232c73.tar.gz
cpython-60f018846d7b97eec71675c3a1c9e7a058232c73.tar.bz2
Merge changes from r22a2-branch back into trunk. Also, change patch
level to 2.2a2+
Diffstat (limited to 'Include')
-rw-r--r--Include/patchlevel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 3d22616..2c3b5dd 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,10 +23,10 @@
#define PY_MINOR_VERSION 2
#define PY_MICRO_VERSION 0
#define PY_RELEASE_LEVEL PY_RELEASE_LEVEL_ALPHA
-#define PY_RELEASE_SERIAL 1
+#define PY_RELEASE_SERIAL 2
/* Version as a string */
-#define PY_VERSION "2.2a1+"
+#define PY_VERSION "2.2a2+"
/* Version as a single 4-byte hex number, e.g. 0x010502B2 == 1.5.2b2.
Use this for numeric comparisons, e.g. #if PY_VERSION_HEX >= ... */