[Cmake-commits] CMake branch, master, updated. v3.6.1-490-g5ec03c9

[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, master has been updated
       via  5ec03c93fc92149708b4ec9d19384a015d845f8e (commit)
       via  ad453f0502fe5d95ca1f050cdf52c2d32a892988 (commit)
       via  6f108f84d08a4cc12ef5bafc93d5aad903ba687a (commit)
      from  88e1c54a7cd3213d87143558a8fddf39e7fdccc0 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ec03c93fc92149708b4ec9d19384a015d845f8e
commit 5ec03c93fc92149708b4ec9d19384a015d845f8e
Merge: 88e1c54 ad453f0
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Aug 1 14:59:53 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 1 14:59:53 2016 -0400

    Merge topic 'wix-disabled-components'
    
    ad453f05 CPackWIX: Support CPACK_COMPONENT_<compName>_DISABLED
    6f108f84 CPackComponent: Document the *_HIDDEN and *_DISABLED variables


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

Summary of changes:
 Help/release/dev/wix-disabled-components.rst   |    6 ++++++
 Modules/CPackComponent.cmake                   |   10 +++++++++-
 Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx |    4 ++++
 3 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 Help/release/dev/wix-disabled-components.rst


hooks/post-receive
-- 
CMake