summaryrefslogtreecommitdiffstats
path: root/Misc
diff options
context:
space:
mode:
authorMartin v. Löwis <martin@v.loewis.de>2008-08-01 14:15:22 (GMT)
committerMartin v. Löwis <martin@v.loewis.de>2008-08-01 14:15:22 (GMT)
commit4fe5ed8f258652c22b182f22478f5edb42f71382 (patch)
tree9777f55b9335d5ca7974a7d8b2d3abf4b78e67f6 /Misc
parent4aab7119b7293b22c8877bb84593a2510457a626 (diff)
downloadcpython-4fe5ed8f258652c22b182f22478f5edb42f71382.zip
cpython-4fe5ed8f258652c22b182f22478f5edb42f71382.tar.gz
cpython-4fe5ed8f258652c22b182f22478f5edb42f71382.tar.bz2
Merged revisions 65368 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r65368 | martin.v.loewis | 2008-08-01 16:10:26 +0200 (Fr, 01 Aug 2008) | 3 lines Generate the PatternGrammar pickle during "make install". Fixes part of #3131. ........
Diffstat (limited to 'Misc')
-rw-r--r--Misc/NEWS13
1 files changed, 13 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index d19984a..886af22 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -26,9 +26,22 @@ Library
file name rather than a ZipInfo instance, so files are extracted with
mode 0600 rather than 000 under Unix.
+<<<<<<< .working
- Issue #2523: Fix quadratic behaviour when read()ing a binary file without
asking for a specific length.
+=======
+Build
+-----
+>>>>>>> .merge-right.r65368
+
+<<<<<<< .working
+=======
+- Generate the PatternGrammar pickle during "make install".
+
+What's New in Python 2.6 beta 2?
+================================
+>>>>>>> .merge-right.r65368
What's new in Python 3.0b2?
===========================