]> granicus.if.org Git - python/commitdiff
Merge 3.6
authorVictor Stinner <victor.stinner@gmail.com>
Thu, 29 Sep 2016 20:31:28 +0000 (22:31 +0200)
committerVictor Stinner <victor.stinner@gmail.com>
Thu, 29 Sep 2016 20:31:28 +0000 (22:31 +0200)
1  2 
Makefile.pre.in

diff --cc Makefile.pre.in
Simple merge