merge with 3.2 branch

This commit is contained in:
Georg Brandl 2013-04-06 16:39:49 +02:00
commit 2fd4abe6a1
7 changed files with 11 additions and 8 deletions

View file

@ -18,6 +18,8 @@ What's New in IDLE 3.3.1?
What's New in IDLE 3.3.0?
=========================
- Issue #17625: Close the replace dialog after it is used.
- Issue #7163: Propagate return value of sys.stdout.write.
- Issue #15318: Prevent writing to sys.stdin.
@ -874,7 +876,3 @@ What's New in IDLEfork 0.9 Alpha 1?
Refer to HISTORY.txt for additional information on earlier releases.
--------------------------------------------------------------------