summaryrefslogtreecommitdiffstats
path: root/Doc/library/json.rst
Commit message (Expand)AuthorAgeFilesLines
* Merged revisions 68162,68166,68171,68176,68195-68196,68210,68232 via svnmerge...Georg Brandl2009-01-031-1/+1
* Remove trailing whitespace.Georg Brandl2009-01-031-9/+9
* Merged revisions 68116-68119,68121,68123-68127 via svnmerge fromBenjamin Peterson2009-01-011-2/+2
* Devil merge!Benjamin Peterson2008-09-281-2/+2
* Fix json examples so they would actually work in Py3kBenjamin Peterson2008-05-151-8/+8
* Convert a lot of print statements to print functions in docstrings,Neal Norwitz2008-05-131-5/+5
* Remove many "versionchanged" items that didn't use the official markup,Georg Brandl2008-05-121-1/+0
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-081-0/+397