[Python-checkins] cpython (merge 3.2 -> default): merged

[martin.v.loewis]

http://hg.python.org/cpython/rev/2b47f0146639
changeset:   72470:2b47f0146639
parent:      72468:3fb9464f9b02
parent:      72469:4951ffc178db
user:        Martin v. Löwis <martin at v.loewis.de>
date:        Sun Sep 25 17:36:31 2011 +0200
summary:
  merged

files:
  Makefile.pre.in |  3 +++
  1 files changed, 3 insertions(+), 0 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -641,6 +641,9 @@
 Objects/unicodeobject.o: $(srcdir)/Objects/unicodeobject.c \
 				$(BYTESTR_DEPS)
 
+Objects/dictobject.o: $(srcdir)/Objects/stringlib/eq.h
+Objects/setobject.o: $(srcdir)/Objects/stringlib/eq.h
+
 $(OPCODETARGETS_H): $(OPCODETARGETGEN_FILES)
 	$(OPCODETARGETGEN) $(OPCODETARGETS_H)
 

-- 
Repository URL: http://hg.python.org/cpython