Skip to content

C
cpython
Kaydet (Commit) 84b7d3a9 authored tarafından Phillip J. Eby's avatar Phillip J. Eby
Dosyalara gözat
Seçenekler

Fix svn merge spew.

üst f7575d0c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
Misc/NEWS
Dosyayı görüntüle @ 84b7d3a9
...@@ -111,14 +111,10 @@ Library ...@@ -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.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment