[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-1036-g0b074f8

[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  0b074f88f5e152bf8de75eae96982e2ad9cc3b8a (commit)
       via  8ffd7b931d065c5214d07216c7d478a006a5128b (commit)
      from  f9daafc39eda5f9e48ec310e902e21f508b03e00 (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=0b074f88f5e152bf8de75eae96982e2ad9cc3b8a
commit 0b074f88f5e152bf8de75eae96982e2ad9cc3b8a
Merge: f9daafc 8ffd7b9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 3 09:30:50 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Dec 3 09:30:50 2014 -0500

    Merge topic 'vs-hlsl-settings' into next
    
    8ffd7b93 Help: Sort property names correctly


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8ffd7b931d065c5214d07216c7d478a006a5128b
commit 8ffd7b931d065c5214d07216c7d478a006a5128b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Dec 3 09:30:25 2014 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Dec 3 09:30:25 2014 -0500

    Help: Sort property names correctly

diff --git a/Help/manual/cmake-properties.7.rst b/Help/manual/cmake-properties.7.rst
index 5bbb89e..9ed53fa 100644
--- a/Help/manual/cmake-properties.7.rst
+++ b/Help/manual/cmake-properties.7.rst
@@ -291,8 +291,8 @@ Properties on Source Files
    /prop_sf/OBJECT_OUTPUTS
    /prop_sf/SYMBOLIC
    /prop_sf/VS_DEPLOYMENT_CONTENT
-   /prop_sf/VS_SHADER_MODEL
    /prop_sf/VS_SHADER_ENTRYPOINT
+   /prop_sf/VS_SHADER_MODEL
    /prop_sf/VS_SHADER_TYPE
    /prop_sf/WRAP_EXCLUDE
    /prop_sf/XCODE_EXPLICIT_FILE_TYPE

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

Summary of changes:
 Help/manual/cmake-properties.7.rst |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake