[Cmake-commits] CMake branch, next, updated. v3.6.0-977-gcb65582

[Nils Gladitz]

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  cb6558209baee2c3c9c41c8b3d71d0cd177983c3 (commit)
       via  585f2fe0d62c40a68c0a9440372a7062b477c67f (commit)
      from  54f9c388896fb8b9d5054801ac1327de43fe245a (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=cb6558209baee2c3c9c41c8b3d71d0cd177983c3
commit cb6558209baee2c3c9c41c8b3d71d0cd177983c3
Merge: 54f9c38 585f2fe
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Jul 22 02:48:41 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jul 22 02:48:41 2016 -0400

    Merge topic 'wix-disabled-components' into next
    
    585f2fe0 CPackWIX: Revise topic release note


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=585f2fe0d62c40a68c0a9440372a7062b477c67f
commit 585f2fe0d62c40a68c0a9440372a7062b477c67f
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Fri Jul 22 08:48:26 2016 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Fri Jul 22 08:48:26 2016 +0200

    CPackWIX: Revise topic release note

diff --git a/Help/release/dev/wix-disabled-components.rst b/Help/release/dev/wix-disabled-components.rst
index ac37bc7..a7e4d5f 100644
--- a/Help/release/dev/wix-disabled-components.rst
+++ b/Help/release/dev/wix-disabled-components.rst
@@ -1,5 +1,6 @@
 wix-disabled-components
 -----------------------
 
-* The CPack WIX generator now supports CPACK_COMPONENT_<COMPONENT>_DISABLED.
+* The CPack WIX generator now supports
+  :variable:`CPACK_COMPONENT_<compName>_DISABLED`.
   This can be used to deselect a component from being installed by default.

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

Summary of changes:
 Help/release/dev/wix-disabled-components.rst |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
CMake