]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
projects / thirdparty / Python / cpython.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1aea1da 5647c47)
Merge #10999 fix.
authorR David Murray <rdmurray@bitdance.com>
Thu, 10 Mar 2011 22:38:50 +0000 (17:38 -0500)
committerR David Murray <rdmurray@bitdance.com>
Thu, 10 Mar 2011 22:38:50 +0000 (17:38 -0500)
1  2 
Doc/library/os.rst patch | diff1 | diff2 | blob | history
Misc/ACKS patch | diff1 | diff2 | blob | history

diff --cc Doc/library/os.rst
Simple merge
diff --cc Misc/ACKS
index 36555d2d0761c10ba2d811ae13172e1be17f3cd3,02882c6c5c645c6cffc47db1088f5ff3951cb7b3..1dc406342ff1f464b3d605088f660a22abc9c3b8
--- 1/Misc/ACKS
--- 2/Misc/ACKS
+++ b/Misc/ACKS
@@@ -622,7 -619,7 +622,8 @@@ Stefan Norber
  Tim Northover
  Joe Norton
  Neal Norwitz
+ Michal Nowikowski
 +Steffen Daode Nurpmeso
  Nigel O'Brian
  Kevin O'Connor
  Tim O'Malley
Mirror of https://github.com/python/cpython.git