summaryrefslogtreecommitdiffstats
path: root/Modules/_json.c
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2009-05-02 06:15:18 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2009-05-02 06:15:18 (GMT)
commit842e8da64231de7d63eef581b806699998d5cc89 (patch)
tree22376e1c48b3b53d872483a9ff205c05844e83c7 /Modules/_json.c
parente54dff5e638c618dbc0f8a7067e2e22031716400 (diff)
downloadcpython-842e8da64231de7d63eef581b806699998d5cc89.zip
cpython-842e8da64231de7d63eef581b806699998d5cc89.tar.gz
cpython-842e8da64231de7d63eef581b806699998d5cc89.tar.bz2
Merged revisions 72183-72184 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r72183 | georg.brandl | 2009-05-01 14:28:35 -0700 (Fri, 01 May 2009) | 2 lines Review ipaddr docs and add them in the TOC under "Internet protocols". ........ r72184 | georg.brandl | 2009-05-01 14:30:25 -0700 (Fri, 01 May 2009) | 1 line Fix directive name. ........
Diffstat (limited to 'Modules/_json.c')
0 files changed, 0 insertions, 0 deletions