summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorÉric Araujo <merwok@netwok.org>2011-10-21 13:52:10 (GMT)
committerÉric Araujo <merwok@netwok.org>2011-10-21 13:52:10 (GMT)
commit3764a964ca4e8c979743ba8c2f08b65ddf8b0070 (patch)
tree704c88662e85d481a54086689dc95c79989e542a /Misc
parent04d5bc00a219860c69ea17eaa633d3ab9917409f (diff)
parent89d3a69d831971d91eab7f799d8c406b00e3f575 (diff)
downloadcpython-3764a964ca4e8c979743ba8c2f08b65ddf8b0070.zip
cpython-3764a964ca4e8c979743ba8c2f08b65ddf8b0070.tar.gz
cpython-3764a964ca4e8c979743ba8c2f08b65ddf8b0070.tar.bz2
Banch merge
Diffstat (limited to 'Misc')
-rw-r--r--Misc/ACKS1
-rw-r--r--Misc/NEWS2
2 files changed, 2 insertions, 1 deletions
diff --git a/Misc/ACKS b/Misc/ACKS
index 6d3a6d9..08531b9 100644
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -56,6 +56,7 @@ Nicolas Bareil
Chris Barker
Nick Barnes
Quentin Barnes
+David Barnett
Richard Barran
Cesar Eduardo Barros
Des Barry
diff --git a/Misc/NEWS b/Misc/NEWS
index 36aafd9..55b261e 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -505,7 +505,7 @@ Library
in os.kill().
- Add support for unary plus and unary minus to collections.Counter().
- Issue #13121: Also an support for inplace math operators.
+ Issue #13121: Also add support for inplace math operators.
- Issue #12683: urlparse updated to include svn as schemes that uses relative
paths. (svn from 1.5 onwards support relative path).