]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a8f43e 52a3b74)
merge 3.4 (#23929)
authorBenjamin Peterson <benjamin@python.org>
Tue, 14 Apr 2015 00:25:11 +0000 (20:25 -0400)
committerBenjamin Peterson <benjamin@python.org>
Tue, 14 Apr 2015 00:25:11 +0000 (20:25 -0400)
1  2 
Lib/os.py patch | diff1 | diff2 | blob | history

diff --cc Lib/os.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.