]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e69419 f5f9c13)
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 19:22:19 +0000 (14:22 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 19:22:19 +0000 (14:22 -0500)
1  2 
Lib/test/test_sys.py patch | diff1 | diff2 | blob | history

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