summaryrefslogtreecommitdiffstats
path: root/Lib/json/encoder.py
Commit message (Expand)AuthorAgeFilesLines
* Merged revisions 82805-82806,83523-83527,83536,83538,83542,83546-83548,83550-...Georg Brandl2010-10-061-5/+5
* Merged revisions 83212,83829,83833,83838-83839,83878,84019,84025,84028,84032,...Florent Xicluna2010-08-141-1/+1
* * Fix-up a TODO (support the sort_key option).Raymond Hettinger2009-05-271-1/+1
* port simplejson upgrade from the trunk #4136Benjamin Peterson2009-05-021-174/+211
* Merged revisions 62805,62811,62841-62842,62848-62849,62853-62854 via svnmerge...Christian Heimes2008-05-081-7/+7
* Merged revisions 62734,62736,62748,62769 via svnmerge fromChristian Heimes2008-05-081-0/+384