]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 32a3b14 bf6bf4f)
merge from 2.7 release branch
authorBenjamin Peterson <benjamin@python.org>
Thu, 15 Mar 2012 18:01:04 +0000 (13:01 -0500)
committerBenjamin Peterson <benjamin@python.org>
Thu, 15 Mar 2012 18:01:04 +0000 (13:01 -0500)
1  2 
Include/patchlevel.h patch | diff1 | diff2 | blob | history
Misc/NEWS patch | diff1 | diff2 | blob | history

diff --cc Include/patchlevel.h
Simple merge
diff --cc Misc/NEWS
Simple merge
Unnamed repository; edit this file 'description' to name the repository.