]> granicus.if.org Git - python/commit
fix broken merge
authorRichard Jones <richard@commonground.com.au>
Tue, 23 May 2006 18:32:11 +0000 (18:32 +0000)
committerRichard Jones <richard@commonground.com.au>
Tue, 23 May 2006 18:32:11 +0000 (18:32 +0000)
commita372711fcc2941488a4b28809350e4498913438a
tree268bd37ebe40f4c46315823c4af37309bced17c8
parentcebbefc98dd7b30ae8c5f7640951e247ece49991
fix broken merge
Objects/frameobject.c