]> granicus.if.org Git - python/commitdiff
projects / python / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61fed9c dec0f21)
Merge from 3.2
authorAntoine Pitrou <solipsis@pitrou.net>
Sat, 3 Dec 2011 22:10:12 +0000 (23:10 +0100)
committerAntoine Pitrou <solipsis@pitrou.net>
Sat, 3 Dec 2011 22:10:12 +0000 (23:10 +0100)
1  2 
Doc/faq/design.rst patch | diff1 | diff2 | blob | history

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