summaryrefslogtreecommitdiffstats
path: root/Lib/json
Commit message (Expand)AuthorAgeFilesLines
...
* merge r66932 and add a few py3k only checksBenjamin Peterson2008-10-162-2/+13
* #2834: Change re module semantics, so that str and bytes mixing is forbidden,Antoine Pitrou2008-08-191-1/+1
* 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-0821-0/+1774