]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
Merge 2.7 heads.
authorRobert Collins <rbtcollins@hp.com>
Mon, 24 Aug 2015 00:10:23 +0000 (12:10 +1200)
committerRobert Collins <rbtcollins@hp.com>
Mon, 24 Aug 2015 00:10:23 +0000 (12:10 +1200)
1  2 
Misc/ACKS
Misc/NEWS

diff --cc Misc/ACKS
Simple merge
diff --cc Misc/NEWS
index 7814de8e1fc9cdfafc9431236dfe0be92d040369,b52cd2ad23ddc583d6faba74bf4c510d2e59c9a9..ebf2ed5c26454a04d31a5cdd757ed7578b1ad389
+++ b/Misc/NEWS
@@@ -34,9 -37,8 +37,11 @@@ Core and Builtin
  Library
  -------
  
 +- Issue #22812: Fix unittest discovery examples.
 +  Patch from Pam McA'Nulty.
 +
+ - Issue #24634: Importing uuid should not try to load libc on Windows
  - Issue #23652: Make it possible to compile the select module against the
    libc headers from the Linux Standard Base, which do not include some
    EPOLL macros.  Initial patch by Matt Frank.
  ----
  
  **(For information about older versions, consult the HISTORY file.)**
++