From: Hirokazu Yamamoto <ocean-city@m2.ccsnet.ne.jp>
Date: Thu, 9 Sep 2010 19:57:17 +0000 (+0000)
Subject: Merged revisions 84645 via svnmerge from
X-Git-Tag: v3.1.3rc1~259
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8e0bb6a1e2907797cd6e4b7cc90539904e54db7e;p=thirdparty%2FPython%2Fcpython.git

Merged revisions 84645 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84645 | hirokazu.yamamoto | 2010-09-09 15:24:43 +0900 | 5 lines

  PCBuild cosmetic fixes.
  * pythoncore.vcproj: Fixed indentation
  * _multiprocessing.vcproj: Converted ProjectGUID to uppercase. Otherwise,
    VS8 _multiprocessing.vcproj created by vs9to8.py was modified every time
    loads it in VS8 IDE.
........
---

diff --git a/PCbuild/_multiprocessing.vcproj b/PCbuild/_multiprocessing.vcproj
index 73aa899cef3b..6aa147e31de7 100644
--- a/PCbuild/_multiprocessing.vcproj
+++ b/PCbuild/_multiprocessing.vcproj
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="9,00"
 	Name="_multiprocessing"
-	ProjectGUID="{9e48b300-37d1-11dd-8c41-005056c00008}"
+	ProjectGUID="{9E48B300-37D1-11DD-8C41-005056C00008}"
 	RootNamespace="_multiprocessing"
 	Keyword="Win32Proj"
 	TargetFrameworkVersion="196613"
diff --git a/PCbuild/pythoncore.vcproj b/PCbuild/pythoncore.vcproj
index 05cffd727af7..da531900a46e 100644
--- a/PCbuild/pythoncore.vcproj
+++ b/PCbuild/pythoncore.vcproj
@@ -846,7 +846,10 @@
 				RelativePath="..\Include\pyarena.h"
 				>
 			</File>
-                        <File RelativePath="..\Include\pycapsule.h"></File>
+			<File
+				RelativePath="..\Include\pycapsule.h"
+				>
+			</File>
 			<File
 				RelativePath="..\Include\pyctype.h"
 				>
@@ -1375,10 +1378,10 @@
 				RelativePath="..\Objects\bytesobject.c"
 				>
 			</File>
-                        <File
-                                RelativePath="..\Objects\capsule.c"
-                                >
-                        </File>
+			<File
+				RelativePath="..\Objects\capsule.c"
+				>
+			</File>
 			<File
 				RelativePath="..\Objects\cellobject.c"
 				>