]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33919e8 4bb09c8)
merge 3.4 (#10503)
authorBenjamin Peterson <benjamin@python.org>
Sat, 7 Jun 2014 20:51:51 +0000 (13:51 -0700)
committerBenjamin Peterson <benjamin@python.org>
Sat, 7 Jun 2014 20:51:51 +0000 (13:51 -0700)
1  2 
Doc/library/os.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/library/os.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.