]> granicus.if.org Git - python/commitdiff
Merge with 3.5
authorZachary Ware <zachary.ware@gmail.com>
Tue, 30 Aug 2016 06:41:35 +0000 (01:41 -0500)
committerZachary Ware <zachary.ware@gmail.com>
Tue, 30 Aug 2016 06:41:35 +0000 (01:41 -0500)
1  2 
Makefile.pre.in

diff --cc Makefile.pre.in
Simple merge