traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed merge glitch

This commit is contained in:
Christian Heimes 2007-12-18 22:00:19 +00:00
parent 60d96cd54c
commit 3880210545
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Misc/NEWS
View File

@ -12,8 +12,6 @@ What's New in Python 2.5.2c1?
Core and builtins Core and builtins
----------------- -----------------
- Issue #1553: An errornous __length_hint__ can make list() raise a
- Issue #1638: %zd configure test fails on Linux - Issue #1638: %zd configure test fails on Linux
- Issue #1620: New property decorator syntax was modifying the decorator - Issue #1620: New property decorator syntax was modifying the decorator
@ -27,7 +25,6 @@ Core and builtins
char is not found. char is not found.
- Issue #1553: An erroneous __length_hint__ can make list() raise a - Issue #1553: An erroneous __length_hint__ can make list() raise a
>>>>>>> .merge-rechts.r59533
SystemError. SystemError.
- Issue #1521: On 64bit platforms, using PyArgs_ParseTuple with the t# of w# - Issue #1521: On 64bit platforms, using PyArgs_ParseTuple with the t# of w#