Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix svn merge spew.

This commit is contained in:
Phillip J. Eby 2006-07-28 21:31:54 +00:00
parent f7575d0cb7
commit 84b7d3a932
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Misc/NEWS
View File

@ -111,14 +111,10 @@ Library
Extension Modules Extension Modules
----------------- -----------------
<<<<<<< .mine
- Bug #1471938: Fix curses module build problem on Solaris 8; patch by
=======
- The ``__reduce__()`` method of the new ``collections.defaultdict`` had - The ``__reduce__()`` method of the new ``collections.defaultdict`` had
a memory leak, affecting pickles and deep copies. a memory leak, affecting pickles and deep copies.
- Bug #1471938: Fix curses module build problem on Solaris 8; patch by - Bug #1471938: Fix curses module build problem on Solaris 8; patch by
>>>>>>> .r50915
Paul Eggert. Paul Eggert.
- Patch #1448199: Release interpreter lock in _winreg.ConnectRegistry. - Patch #1448199: Release interpreter lock in _winreg.ConnectRegistry.