[Cmake-commits] CMake branch, next, updated. v2.8.2-233-g3cde195

[Bill Hoffman]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  3cde1954a41ee92f2d26c8e808e05c77f3df35cb (commit)
       via  8507a73ea6e394b6ad42b7a2df562ee7b4bd4950 (commit)
       via  6327429f55949702f0d0c8e2888a9ae01910382b (commit)
      from  4e7b24ea9f5ac63d04a65e184d33e09d36596e75 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3cde1954a41ee92f2d26c8e808e05c77f3df35cb
commit 3cde1954a41ee92f2d26c8e808e05c77f3df35cb
Merge: 4e7b24e 8507a73
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jul 13 09:09:08 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Jul 13 09:09:08 2010 -0400

    Merge branch 'guid_vs_newname' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8507a73ea6e394b6ad42b7a2df562ee7b4bd4950
commit 8507a73ea6e394b6ad42b7a2df562ee7b4bd4950
Author:     Bill Hoffman <bill.hoffman at kitware.com>
AuthorDate: Tue Jul 13 09:07:59 2010 -0400
Commit:     Bill Hoffman <bill.hoffman at kitware.com>
CommitDate: Tue Jul 13 09:07:59 2010 -0400

    Fix for bug#10483, INCLUDE_EXTERNAL_MSPROJECT: ProjectGUID now ProjectGuid

diff --git a/Source/cmLocalVisualStudio10Generator.cxx b/Source/cmLocalVisualStudio10Generator.cxx
index 8df0ffa..57d8653 100644
--- a/Source/cmLocalVisualStudio10Generator.cxx
+++ b/Source/cmLocalVisualStudio10Generator.cxx
@@ -37,7 +37,7 @@ class cmVS10XMLParser : public cmXMLParser
         {
         return;
         }
-      if(strcmp("ProjectGUID", name) == 0)
+      if(strcmp("ProjectGUID", name) == 0 || strcmp("ProjectGuid", name) == 0)
         {
         this->DoGUID = true;
         } 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmLocalVisualStudio10Generator.cxx |    2 +-
 Source/kwsys/kwsysDateStamp.cmake         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake