]> 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: b10be15 e218bcb)
merge 3.4 (closes #22307)
authorBenjamin Peterson <benjamin@python.org>
Sun, 31 Aug 2014 01:06:00 +0000 (21:06 -0400)
committerBenjamin Peterson <benjamin@python.org>
Sun, 31 Aug 2014 01:06:00 +0000 (21:06 -0400)
1  2 
Doc/library/os.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/os.rst
Simple merge
Mirror of https://github.com/python/cpython.git