merge 2.7.11 branch

This commit is contained in:
Benjamin Peterson
2015-12-05 11:45:48 -08:00
3 changed files with 4 additions and 6 deletions

View File

@@ -171,3 +171,4 @@ ee879c0ffa11caaa34bf01537e1c4411dd948552 v2.7.8
80ccce248ba2657ed5da3ccf7999f35b78827f5e v2.7.10rc1
15c95b7d81dcf821daade360741e00714667653f v2.7.10
82dd9545bd93d6e7a9821e1dabc7b25508d0fa3a v2.7.11rc1
6d1b6a68f775fada9877d295e62958bafa1ca11e v2.7.11

View File

@@ -23,11 +23,11 @@
#define PY_MAJOR_VERSION 2
#define PY_MINOR_VERSION 7
#define PY_MICRO_VERSION 11
#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.11rc1+"
#define PY_VERSION "2.7.11"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository). Empty

View File

@@ -59,9 +59,6 @@ What's New in Python 2.7.11?
*Release date: 2015-12-05*
Core and Builtins
-----------------
Library
-------