]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f7eaa0c 0d50af4)
Merge 3.4
authorAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 3 Jul 2014 13:07:57 +0000 (16:07 +0300)
committerAndrew Svetlov <andrew.svetlov@gmail.com>
Thu, 3 Jul 2014 13:07:57 +0000 (16:07 +0300)
1  2 
Doc/c-api/typeobj.rst patch | diff1 | diff2 | blob | history

diff --cc Doc/c-api/typeobj.rst
Simple merge
Unnamed repository; edit this file 'description' to name the repository.