diff Include/patchlevel.h @ 70301:86fa95c560a6 2.6

Replay changeset 70238:03e488b5c009 from fubar branch. Original commit message: Reconcile with the 2.6svn branch. The 2.6.7 release will be made from Subversion, but there were differences, so this brings them in sync. These changes should *not* propagate to any newer versions.
author Barry Warsaw <barry@python.org>
date Mon, 23 May 2011 15:22:56 -0400
parents 787b969d37f0
children 1fd89faa3900
line wrap: on
line diff
--- a/Include/patchlevel.h	Sun May 22 21:16:55 2011 -0400
+++ b/Include/patchlevel.h	Mon May 23 15:22:56 2011 -0400
@@ -22,12 +22,12 @@
 /*--start constants--*/
 #define PY_MAJOR_VERSION	2
 #define PY_MINOR_VERSION	6
-#define PY_MICRO_VERSION	6
-#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_FINAL
-#define PY_RELEASE_SERIAL	0
+#define PY_MICRO_VERSION	7
+#define PY_RELEASE_LEVEL	PY_RELEASE_LEVEL_GAMMA
+#define PY_RELEASE_SERIAL	1
 
 /* Version as a string */
-#define PY_VERSION      	"2.6.6+"
+#define PY_VERSION      	"2.6.7rc1"
 /*--end constants--*/
 
 /* Subversion Revision number of this file (not of the repository) */