]> 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: 42d9b02 d3304e3)
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Mon, 25 Apr 2016 14:27:49 +0000 (09:27 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Mon, 25 Apr 2016 14:27:49 +0000 (09:27 -0500)
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