[Cmake-commits] CMake branch, master, updated. v3.6.1-586-g892ffe4

[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  892ffe4ebd5ca0fd36255671efe37edc9448b470 (commit)
       via  17bbf6af1ecca15194a693d31fdd8163aacfd994 (commit)
      from  982b4cd602fc125c9d2165145100d5e574644bf9 (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=892ffe4ebd5ca0fd36255671efe37edc9448b470
commit 892ffe4ebd5ca0fd36255671efe37edc9448b470
Merge: 982b4cd 17bbf6a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 9 09:20:13 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 9 09:20:13 2016 -0400

    Merge topic 'wix-custom-install-dir'
    
    17bbf6af CPackWIX: Implement new CPACK_WIX_SKIP_PROGRAM_FOLDER feature


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

Summary of changes:
 Help/release/dev/wix-custom-install-dir.rst       |    7 +++++++
 Modules/CPackWIX.cmake                            |   17 +++++++++++++++++
 Source/CPack/WiX/cmCPackWIXGenerator.cxx          |    9 +++++++++
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx |   10 +++++++---
 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx       |   14 +++++++++++++-
 Source/CPack/WiX/cmWIXFilesSourceWriter.h         |    2 ++
 6 files changed, 55 insertions(+), 4 deletions(-)
 create mode 100644 Help/release/dev/wix-custom-install-dir.rst


hooks/post-receive
-- 
CMake