]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9b4cc6b e823933)
merge 3.4 (#22954)
authorBenjamin Peterson <benjamin@python.org>
Thu, 27 Nov 2014 05:03:34 +0000 (23:03 -0600)
committerBenjamin Peterson <benjamin@python.org>
Thu, 27 Nov 2014 05:03:34 +0000 (23:03 -0600)
1  2 
Objects/typeobject.c patch | diff1 | diff2 | blob | history

diff --cc Objects/typeobject.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.