]> 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: 8ef887c bbbbe7e)
Merge with 3.4
authorZachary Ware <zachary.ware@gmail.com>
Mon, 13 Apr 2015 23:34:57 +0000 (18:34 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Mon, 13 Apr 2015 23:34:57 +0000 (18:34 -0500)
1  2 
Tools/clinic/clinic.py patch | diff1 | diff2 | blob | history

diff --cc Tools/clinic/clinic.py
Simple merge
Mirror of https://github.com/python/cpython.git