]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8f60c0e e1d26f3)
merge with 3.4
authorGeorg Brandl <georg@python.org>
Fri, 31 Oct 2014 12:13:09 +0000 (13:13 +0100)
committerGeorg Brandl <georg@python.org>
Fri, 31 Oct 2014 12:13:09 +0000 (13:13 +0100)
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.