summaryrefslogtreecommitdiffstats
path: root/Objects/obmalloc.c
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-07-18 14:28:26 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-07-18 14:28:26 (GMT)
commit7a502de6f809f1ecb110bd84ffda94dd852f53ed (patch)
tree6934121e8fb14bda0a46350297e3aa5a8efc14b5 /Objects/obmalloc.c
parent721e9aa425b9603a630f38694e8cfae15e4420bb (diff)
downloadcpython-7a502de6f809f1ecb110bd84ffda94dd852f53ed.zip
cpython-7a502de6f809f1ecb110bd84ffda94dd852f53ed.tar.gz
cpython-7a502de6f809f1ecb110bd84ffda94dd852f53ed.tar.bz2
Merged revisions 82952,82954 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r82952 | benjamin.peterson | 2010-07-18 09:23:36 -0500 (Sun, 18 Jul 2010) | 1 line use classmethod ........ r82954 | benjamin.peterson | 2010-07-18 09:27:02 -0500 (Sun, 18 Jul 2010) | 1 line nest method and attribute doc ........
Diffstat (limited to 'Objects/obmalloc.c')
0 files changed, 0 insertions, 0 deletions