Merged revisions 84644 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r84644 | hirokazu.yamamoto | 2010-09-09 15:14:23 +0900 | 1 line

  Updated VS7.1 project file. (I cannot test this file because I don't have VS7.1)
........

diff --git a/Misc/ACKS b/Misc/ACKS
index ea774ab2144f585afefcec182ce3b439999416ac..0c48237f8d7b921bc8fd39a41dcfdc5f5217754e 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -857,6 +857,7 @@ Gordon Worley
 Thomas Wouters
 Heiko Wundram
 Doug Wyatt
+Hirokazu Yamamoto
 Ka-Ping Yee
 Bob Yodlowski
 Danny Yoo

diff --git a/PC/VS7.1/pythoncore.vcproj b/PC/VS7.1/pythoncore.vcproj
index 4a6ed1aff99ceb27b737be5de616830f6884000f..9e63ae2f6d04f908309fb2f489d39d9f0e9599af 100644 (file)
--- a/PC/VS7.1/pythoncore.vcproj
+++ b/PC/VS7.1/pythoncore.vcproj
@@ -465,6 +465,9 @@
                <File
                        RelativePath="..\..\Objects\boolobject.c">
                </File>
+               <File
+                       RelativePath="..\..\Objects\bytearrayobject.c">
+               </File>
                <File
                        RelativePath="..\..\Objects\bytes_methods.c">
                </File>
@@ -775,9 +778,6 @@
                <File
                        RelativePath="..\..\Objects\sliceobject.c">
                </File>
-               <File
-                       RelativePath="..\..\Objects\stringobject.c">
-               </File>
                <File
                        RelativePath="..\..\Python\structmember.c">
                </File>