[Python-checkins] r50917 - python/trunk/Misc/NEWS
phillip.eby
python-checkins at python.org
Fri Jul 28 23:31:55 CEST 2006
Author: phillip.eby
Date: Fri Jul 28 23:31:54 2006
New Revision: 50917
Modified:
python/trunk/Misc/NEWS
Log:
Fix svn merge spew.
Modified: python/trunk/Misc/NEWS
==============================================================================
--- python/trunk/Misc/NEWS (original)
+++ python/trunk/Misc/NEWS Fri Jul 28 23:31:54 2006
@@ -111,14 +111,10 @@
Extension Modules
-----------------
-<<<<<<< .mine
-- Bug #1471938: Fix curses module build problem on Solaris 8; patch by
-=======
- The ``__reduce__()`` method of the new ``collections.defaultdict`` had
a memory leak, affecting pickles and deep copies.
- Bug #1471938: Fix curses module build problem on Solaris 8; patch by
->>>>>>> .r50915
Paul Eggert.
- Patch #1448199: Release interpreter lock in _winreg.ConnectRegistry.
More information about the Python-checkins
mailing list