]> granicus.if.org Git - python/commitdiff
hg merge 3.2
authorAmaury Forgeot d'Arc <amauryfa@gmail.com>
Fri, 13 Apr 2012 00:23:59 +0000 (02:23 +0200)
committerAmaury Forgeot d'Arc <amauryfa@gmail.com>
Fri, 13 Apr 2012 00:23:59 +0000 (02:23 +0200)
1  2 
PC/VC6/pythoncore.dsp
PC/VS7.1/pythoncore.vcproj

Simple merge
Simple merge