summaryrefslogtreecommitdiff
path: root/Doc/contents.rst
Commit message (Expand)AuthorAgeFilesLines
* merge from trunkBenjamin Peterson2008-10-111-1/+1
* #1370: Finish the merge r58749, log below, by resolving all conflicts in Doc/.Georg Brandl2007-11-011-0/+1
* Another merge. Only doc stuff was affected (but this aligns the UTF-32Guido van Rossum2007-08-171-0/+1
* Move the 3k reST doc tree in place.Georg Brandl2007-08-151-0/+21