summaryrefslogtreecommitdiff
path: root/Doc/glossary.rst
Commit message (Collapse)AuthorAgeFilesLines
* Another merge. Only doc stuff was affected (but this aligns the UTF-32Guido van Rossum2007-08-171-0/+320
codec changes in trubk and branch). Hopefully the Py3k glossary wasn't different from the trunk one.