diff options
| author | Benjamin Peterson <benjamin@python.org> | 2015-05-23 16:03:20 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2015-05-23 16:03:20 (GMT) |
| commit | 5bd3be83fa7b5ce4327fb65401219207adb5b10e (patch) | |
| tree | 7297f2a71299abfd437cb0cd877c76242507ca08 | |
| parent | fa3d5b5b95d3ab0ef8f3d71b3248ed638fd116b4 (diff) | |
| parent | 5546face6e64ab205710f2022503284cf081f6f1 (diff) | |
| download | cpython-5bd3be83fa7b5ce4327fb65401219207adb5b10e.zip cpython-5bd3be83fa7b5ce4327fb65401219207adb5b10e.tar.gz cpython-5bd3be83fa7b5ce4327fb65401219207adb5b10e.tar.bz2 | |
merge 2.7.10 release branch
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | Include/patchlevel.h | 6 | ||||
| -rw-r--r-- | Lib/distutils/__init__.py | 2 |
3 files changed, 5 insertions, 4 deletions
@@ -169,3 +169,4 @@ ee879c0ffa11caaa34bf01537e1c4411dd948552 v2.7.8 40eada278702349a2b2f334aa9d91fa7090ea1e3 v2.7.9rc1 648dcafa7e5f40da31079bc7a7f0c445f1ea4ab9 v2.7.9 80ccce248ba2657ed5da3ccf7999f35b78827f5e v2.7.10rc1 +15c95b7d81dcf821daade360741e00714667653f v2.7.10 diff --git a/Include/patchlevel.h b/Include/patchlevel.h index 3789b05..a71efde 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 10 -#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.10rc1" +#define PY_VERSION "2.7.10" /*--end constants--*/ /* Subversion Revision number of this file (not of the repository). Empty diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py index 90f438d..03708963 100644 --- a/Lib/distutils/__init__.py +++ b/Lib/distutils/__init__.py @@ -15,5 +15,5 @@ __revision__ = "$Id$" # Updated automatically by the Python release process. # #--start constants-- -__version__ = "2.7.10rc1" +__version__ = "2.7.10" #--end constants-- |