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, master has been updated
via b9eac05fb65198f1522ecec756f3fb4ae253e34b (commit)
via 2a224b4ce3fcc3c25bb3f56cf50806ae79262fc2 (commit)
from f773e28a8e6033ca128e1dd223fc2345a97efba5 (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=b9eac05fb65198f1522ecec756f3fb4ae253e34b
commit b9eac05fb65198f1522ecec756f3fb4ae253e34b
Merge: f773e28 2a224b4
Author: Brad King <[email protected]>
AuthorDate: Wed Dec 3 10:01:49 2014 -0500
Commit: CMake Topic Stage <[email protected]>
CommitDate: Wed Dec 3 10:01:49 2014 -0500
Merge topic 'vs-hlsl-settings'
2a224b4c VS: Add source file properties to set the hlsl shader entry point
and model
-----------------------------------------------------------------------
Summary of changes:
Help/manual/cmake-properties.7.rst | 2 ++
Help/prop_sf/VS_SHADER_ENTRYPOINT.rst | 5 ++++
Help/prop_sf/VS_SHADER_MODEL.rst | 5 ++++
Help/release/3.1.0.rst | 6 +++--
Source/cmVisualStudio10TargetGenerator.cxx | 27 +++++++++++++++++++-
Tests/VSWinStorePhone/CMakeLists.txt | 6 +++++
.../Direct3DApp1/SimplePixelShader.hlsl | 2 +-
.../Direct3DApp1/SimpleVertexShader.hlsl | 2 +-
8 files changed, 50 insertions(+), 5 deletions(-)
create mode 100644 Help/prop_sf/VS_SHADER_ENTRYPOINT.rst
create mode 100644 Help/prop_sf/VS_SHADER_MODEL.rst
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
[email protected]
http://public.kitware.com/mailman/listinfo/cmake-commits
