[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1076-gd6a34e7

[Brad King]

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  d6a34e781a210d3c9794d62ed53bbd99d3559357 (commit)
       via  955fbf29c748209c696a59effc39d19099e52095 (commit)
      from  3b0e433bd1f4da2e5c4241e6dc6b8a890f27c092 (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=d6a34e781a210d3c9794d62ed53bbd99d3559357
commit d6a34e781a210d3c9794d62ed53bbd99d3559357
Merge: 3b0e433 955fbf2
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 3 14:13:31 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 3 14:13:31 2014 -0500

    Merge topic 'vs-hlsl-typo' into next
    
    955fbf29 VS: Fix typo in VS_SHADER_MODEL lookup comment


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=955fbf29c748209c696a59effc39d19099e52095
commit 955fbf29c748209c696a59effc39d19099e52095
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 3 14:12:32 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 3 14:12:32 2014 -0500

    VS: Fix typo in VS_SHADER_MODEL lookup comment

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 4fbd8fd..15a9d20 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -1221,7 +1221,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
       shaderEntryPoint = se;
       toolHasSettings = true;
       }
-    // Figure out which entry point to use if any
+    // Figure out which shader model to use if any
     if (const char* sm = sf->GetProperty("VS_SHADER_MODEL"))
       {
       shaderModel = sm;

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

Summary of changes:
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake