]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b90f5d 7213fcc)
Merge from 3.4.
authorStefan Krah <skrah@bytereef.org>
Sun, 1 Feb 2015 18:19:49 +0000 (19:19 +0100)
committerStefan Krah <skrah@bytereef.org>
Sun, 1 Feb 2015 18:19:49 +0000 (19:19 +0100)
1  2 
Modules/_testcapimodule.c patch | diff1 | diff2 | blob | history
Objects/abstract.c patch | diff1 | diff2 | blob | history

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