]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5cd87a8 75c0d4f)
Merge 3.6.
authorStefan Krah <skrah@bytereef.org>
Sat, 4 Feb 2017 13:59:11 +0000 (14:59 +0100)
committerStefan Krah <skrah@bytereef.org>
Sat, 4 Feb 2017 13:59:11 +0000 (14:59 +0100)
1  2 
setup.py patch | diff1 | diff2 | blob | history

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