[Python-checkins] cpython (merge 2.7 -> 2.7): merge

Mon Sep 10 13:19:30 CEST 2012

http://hg.python.org/cpython/rev/9c30a69c72ec
changeset: 78952:9c30a69c72ec
branch: 2.7
parent: 78951:aa804ef5a6ca
parent: 78948:d261defe4613
user: Christian Heimes <christian at cheimes.de>
date: Mon Sep 10 13:19:15 2012 +0200
summary:
 merge
files:
 Modules/Setup.dist | 1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/Modules/Setup.dist b/Modules/Setup.dist
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -177,6 +177,7 @@
 #_testcapi _testcapimodule.c # Python C API test module
 #_random _randommodule.c	# Random number generator
 #_collections _collectionsmodule.c # Container types
+#_heapq _heapqmodule.c		# Heapq type
 #itertools itertoolsmodule.c	# Functions creating iterators for efficient looping 
 #strop stropmodule.c		# String manipulations
 #_functools _functoolsmodule.c	# Tools for working with functions and callable objects
-- 
Repository URL: http://hg.python.org/cpython
