]> granicus.if.org Git - python/commitdiff
Issue #22770: merge from 3.4
authorNed Deily <nad@acm.org>
Sun, 2 Nov 2014 02:33:25 +0000 (19:33 -0700)
committerNed Deily <nad@acm.org>
Sun, 2 Nov 2014 02:33:25 +0000 (19:33 -0700)
1  2 
Misc/NEWS

diff --cc Misc/NEWS
index c47b3ff50a9c731f2ef6799ee8197759354e6f4a,c52aa62efddb888dd1f15a7dc4b6fba209fb5411..3f62b97e2f779042c114dcb8b96c89d9a5efd72f
+++ b/Misc/NEWS
@@@ -1342,6 -962,6 +1342,8 @@@ Test
  - Issue #21093: Prevent failures of ctypes test_macholib on OS X if a
    copy of libz exists in $HOME/lib or /usr/local/lib.
  
++- Issue #22770: Prevent some Tk segfaults on OS X when running gui tests.
++
  Tools/Demos
  -----------