summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorLarry Hastings <larry@hastings.org>2014-10-08 09:50:50 (GMT)
committerLarry Hastings <larry@hastings.org>2014-10-08 09:50:50 (GMT)
commit2ce95d7b7c6252a720a7174ea837f88092ff35f1 (patch)
tree9e2059a43c69f32bd44d89ed1cfc59cd1424f764 /Misc
parentdeb7bf123c6833f19e9ccab3a2a497588ff7052c (diff)
parentadeb140cb3f5bcf2ceab84796160ce654dbf1151 (diff)
downloadcpython-2ce95d7b7c6252a720a7174ea837f88092ff35f1.zip
cpython-2ce95d7b7c6252a720a7174ea837f88092ff35f1.tar.gz
cpython-2ce95d7b7c6252a720a7174ea837f88092ff35f1.tar.bz2
Merge from 3.4.2 release head back into 3.4 mainline.
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS6
-rw-r--r--Misc/RPM/python-3.4.spec2
2 files changed, 5 insertions, 3 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 17e9d1c..93eedd5 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -3,8 +3,10 @@ Python News
+++++++++++
-What's New in Python 3.4.3?
-===========================
+What's New in Python 3.4.3rc1?
+==============================
+
+Release date: TBA
Core and Builtins
-----------------
diff --git a/Misc/RPM/python-3.4.spec b/Misc/RPM/python-3.4.spec
index fde5983..dc83c18 100644
--- a/Misc/RPM/python-3.4.spec
+++ b/Misc/RPM/python-3.4.spec
@@ -39,7 +39,7 @@
%define name python
#--start constants--
-%define version 3.4.2rc1
+%define version 3.4.2
%define libvers 3.4
#--end constants--
%define release 1pydotorg