From: Mark Dickinson <dickinsm@gmail.com>
Date: Sat, 29 May 2010 21:03:13 +0000 (+0000)
Subject: Merged revisions 81602 via svnmerge from
X-Git-Tag: v2.6.6rc1~231
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1fe418839630dbedfdcbcd038dcc2b954a508fe7;p=python

Merged revisions 81602 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r81602 | mark.dickinson | 2010-05-29 22:00:52 +0100 (Sat, 29 May 2010) | 1 line

  Untabify Modules/config.c.in.
........
---

diff --git a/Modules/config.c.in b/Modules/config.c.in
index d5ca10f89d..faa427ace2 100644
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -34,33 +34,32 @@ struct _inittab _PyImport_Inittab[] = {
 
 /* -- ADDMODULE MARKER 2 -- */
 
-	/* This module lives in marshal.c */
-	{"marshal", PyMarshal_Init},
+    /* This module lives in marshal.c */
+    {"marshal", PyMarshal_Init},
 
-	/* This lives in import.c */
-	{"imp", initimp},
+    /* This lives in import.c */
+    {"imp", initimp},
 
-	/* This lives in Python/Python-ast.c */
-	{"_ast", init_ast},
+    /* This lives in Python/Python-ast.c */
+    {"_ast", init_ast},
 
-	/* These entries are here for sys.builtin_module_names */
-	{"__main__", NULL},
-	{"__builtin__", NULL},
-	{"sys", NULL},
-	{"exceptions", NULL},
+    /* These entries are here for sys.builtin_module_names */
+    {"__main__", NULL},
+    {"__builtin__", NULL},
+    {"sys", NULL},
+    {"exceptions", NULL},
 
-	/* This lives in gcmodule.c */
-	{"gc", initgc},
+    /* This lives in gcmodule.c */
+    {"gc", initgc},
 
-	/* This lives in _warnings.c */
-	{"_warnings", _PyWarnings_Init},
+    /* This lives in _warnings.c */
+    {"_warnings", _PyWarnings_Init},
 
-	/* Sentinel */
-	{0, 0}
+    /* Sentinel */
+    {0, 0}
 };
 
 
 #ifdef __cplusplus
 }
 #endif
-