summaryrefslogtreecommitdiffstats
path: root/Objects
diff options
context:
space:
mode:
authorRoss Lagerwall <rosslagerwall@gmail.com>2011-04-05 13:48:47 (GMT)
committerRoss Lagerwall <rosslagerwall@gmail.com>2011-04-05 13:48:47 (GMT)
commit02ba73c0ef4e5b6822b585e99f3bd520e83a1c2e (patch)
tree583061e85c79fe704370250dce43669cf5447f5c /Objects
parent4333affb74f29d46d28ba2b202aa9ff48716cab2 (diff)
parent4f61b025203cf3fcd52eab2ece0d3f60b0bacd48 (diff)
downloadcpython-02ba73c0ef4e5b6822b585e99f3bd520e83a1c2e.zip
cpython-02ba73c0ef4e5b6822b585e99f3bd520e83a1c2e.tar.gz
cpython-02ba73c0ef4e5b6822b585e99f3bd520e83a1c2e.tar.bz2
Merge with 3.1
Diffstat (limited to 'Objects')
-rw-r--r--Objects/typeslots.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/Objects/typeslots.inc b/Objects/typeslots.inc
index 0494a32..5186dcf 100644
--- a/Objects/typeslots.inc
+++ b/Objects/typeslots.inc
@@ -1,4 +1,4 @@
-/* Generated by typeslots.py $Revision: 87806 $ */
+/* Generated by typeslots.py $Revision$ */
0,
0,
offsetof(PyHeapTypeObject, as_mapping.mp_ass_subscript),