summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-05-23 15:27:52 -0400
committerBarry Warsaw <barry@python.org>2011-05-23 15:27:52 -0400
commit51228dcd1c23959cdd68712c8b2507bed4effccf (patch)
tree428a7519c57e6ef6086a54dc16ecb742ee2bcd85
parentbdd75a6280cbad208effe3e8a51ff3b81e15768b (diff)
downloadcpython-51228dcd1c23959cdd68712c8b2507bed4effccf.tar.gz
Replay changeset 70249:b571c7a8cf2e from fubar branch. Original commit
message: Merging post 2.6.7rc2 changes from Subversion.
-rw-r--r--Include/patchlevel.h2
-rw-r--r--Misc/NEWS12
2 files changed, 12 insertions, 2 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index a1e4f51b7b..b0f049e8b7 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -27,7 +27,7 @@
#define PY_RELEASE_SERIAL 2
/* Version as a string */
-#define PY_VERSION "2.6.7rc2"
+#define PY_VERSION "2.6.7rc2+"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository) */
diff --git a/Misc/NEWS b/Misc/NEWS
index d1bbdba9a7..99935e90fd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,7 +2,17 @@
Python News
+++++++++++
-(editors: check NEWS.help for information about editing NEWS using ReST.)
+What's New in Python 2.6.7?
+===========================
+
+*Release date: XXXX-XX-XX*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
What's New in Python 2.6.7 rc 2?
================================