diff options
| author | Barry Warsaw <barry@python.org> | 2011-05-23 19:22:56 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2011-05-23 19:22:56 (GMT) |
| commit | cf0d8ab818852503057b8ade6cccc403fbb5d2be (patch) | |
| tree | 8fcd89ece63691dade1d0c0f5c78f5b70eb84880 /Include | |
| parent | e26bc109ffe4ca1c0cb73270d6f8662e6191cb40 (diff) | |
| download | cpython-cf0d8ab818852503057b8ade6cccc403fbb5d2be.zip cpython-cf0d8ab818852503057b8ade6cccc403fbb5d2be.tar.gz cpython-cf0d8ab818852503057b8ade6cccc403fbb5d2be.tar.bz2 | |
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.
Diffstat (limited to 'Include')
| -rw-r--r-- | Include/patchlevel.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 3952d07..abe0763 100644 --- a/Include/patchlevel.h +++ b/Include/patchlevel.h @@ -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) */ |