summaryrefslogtreecommitdiffstats
path: root/Doc/library/json.rst
Commit message (Expand)AuthorAgeFilesLines
* Merged revisions 70590,70650,70704,70768-70769,70776,71008,71010-71011 via sv...Georg Brandl2009-10-271-1/+1
* Merged revisions 71786-71787,71814-71817,71901-71903 via svnmerge fromGeorg Brandl2009-04-281-1/+1
* Merged revisions 68133-68134,68141-68142,68145-68146,68148-68149,68159-68162,...Georg Brandl2009-01-031-12/+12
* Merged revisions 67952-67953,67955,67957-67958,67960-67961,67963,67965,67967,...Georg Brandl2009-01-011-2/+2
* Indentation normalization.Georg Brandl2008-09-241-2/+2
* Fix JSON module docs.Georg Brandl2008-05-051-142/+108
* Add the 'json' package. Code taken from simplejson 1.9 and contributed by BobBrett Cannon2008-05-051-0/+431