summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2011-06-11 16:33:01 (GMT)
committerBenjamin Peterson <benjamin@python.org>2011-06-11 16:33:01 (GMT)
commitacde6a0a40bc749aed4bb5f30560d1c5a9e2be3c (patch)
treee5b5e9774e898cd0abb797e7c7267ee9c9af7434
parentf2ff3054f979370c3cb577eae2f3aa1e935cd15f (diff)
downloadcpython-acde6a0a40bc749aed4bb5f30560d1c5a9e2be3c.zip
cpython-acde6a0a40bc749aed4bb5f30560d1c5a9e2be3c.tar.gz
cpython-acde6a0a40bc749aed4bb5f30560d1c5a9e2be3c.tar.bz2
onto 3.1.5
-rw-r--r--Include/patchlevel.h2
-rw-r--r--Misc/NEWS12
2 files changed, 13 insertions, 1 deletions
diff --git a/Include/patchlevel.h b/Include/patchlevel.h
index 3b06447..d9652a5 100644
--- a/Include/patchlevel.h
+++ b/Include/patchlevel.h
@@ -23,7 +23,7 @@
#define PY_RELEASE_SERIAL 0
/* Version as a string */
-#define PY_VERSION "3.1.4"
+#define PY_VERSION "3.1.4+"
/*--end constants--*/
/* Subversion Revision number of this file (not of the repository). Empty
diff --git a/Misc/NEWS b/Misc/NEWS
index eab5cc9..e68a4e3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -2,6 +2,18 @@
Python News
+++++++++++
+What's New in Python 3.1.5?
+===========================
+
+*Release date: XXXX-XX-XX*
+
+Core and Builtins
+-----------------
+
+Library
+-------
+
+
What's New in Python 3.1.4?
===========================