]> 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: 83e814d d40f136)
merge 3.4
authorBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 01:18:29 +0000 (20:18 -0500)
committerBenjamin Peterson <benjamin@python.org>
Mon, 2 Feb 2015 01:18:29 +0000 (20:18 -0500)
1  2 
Lib/site.py patch | diff1 | diff2 | blob | history
Lib/test/test_site.py patch | diff1 | diff2 | blob | history

diff --cc Lib/site.py
Simple merge
diff --cc Lib/test/test_site.py
Simple merge
Mirror of https://github.com/python/cpython.git