]> granicus.if.org Git - python/commitdiff
Merge heads
authorSerhiy Storchaka <storchaka@gmail.com>
Wed, 2 Jan 2013 08:40:36 +0000 (10:40 +0200)
committerSerhiy Storchaka <storchaka@gmail.com>
Wed, 2 Jan 2013 08:40:36 +0000 (10:40 +0200)
1  2 
Lib/tkinter/__init__.py
Misc/NEWS

Simple merge
diff --cc Misc/NEWS
Simple merge