summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2012-02-05 12:41:47 (GMT)
committerÉric Araujo <merwok@netwok.org>2012-02-05 12:41:47 (GMT)
commitcd2a6033ac0bafd69a7cba2d132e092127acc895 (patch)
tree4e5d6c97edcf7056659a37371a24da12ef018172 /Misc
parentbd249c1bae9e70368ca190ca8e60b3e5343e9344 (diff)
parent89dfd5cf80965fcf1d3fe4db8268f8acc67b5f64 (diff)
downloadcpython-cd2a6033ac0bafd69a7cba2d132e092127acc895.zip
cpython-cd2a6033ac0bafd69a7cba2d132e092127acc895.tar.gz
cpython-cd2a6033ac0bafd69a7cba2d132e092127acc895.tar.bz2
Branch merge
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
2 files changed, 3 insertions, 0 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index ccc1fec..313aed5 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -767,6 +767,7 @@ Vlad Riscutia
Juan M. Bello Rivas
Davide Rizzo
Anthony Roach
+Carl Robben
Mark Roberts
Jim Robinson
Andy Robinson
diff --git a/Misc/NEWS b/Misc/NEWS
index d3a3b9e..70c5f10 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -113,6 +113,8 @@ Core and Builtins
Library
-------
+- Issue #2945: Make the distutils upload command aware of bdist_rpm products.
+
- Issue #13933: IDLE auto-complete did not work with some imported
module, like hashlib. (Patch by Roger Serwy)