[Cmake-commits] CMake branch, master, updated. v3.6.1-887-gbb000ba

[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  bb000ba4fa53a91354f6630f0ef0666ef31eda4c (commit)
       via  1bc33257d48bb4b54333b755951967c6c3fa1df6 (commit)
      from  6137054744e262cf8b1ddebfa4a08e00a0feffed (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=bb000ba4fa53a91354f6630f0ef0666ef31eda4c
commit bb000ba4fa53a91354f6630f0ef0666ef31eda4c
Merge: 6137054 1bc3325
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 7 09:48:26 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 7 09:48:26 2016 -0400

    Merge topic 'wix-fix-static-prefix'
    
    1bc33257 CPackWIX: Fix incomplete CPACK_WIX_SKIP_PROGRAM_FOLDER implementation


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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx          |   39 +++++++++++++--------
 Source/CPack/WiX/cmCPackWIXGenerator.h            |    2 ++
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.cxx |    4 +--
 Source/CPack/WiX/cmWIXDirectoriesSourceWriter.h   |    4 +--
 Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx    |    6 ++--
 Source/CPack/WiX/cmWIXFeaturesSourceWriter.h      |    3 +-
 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx       |   14 +++-----
 Source/CPack/WiX/cmWIXFilesSourceWriter.h         |    5 ++-
 Source/CPack/WiX/cmWIXSourceWriter.cxx            |   21 +++++++++--
 Source/CPack/WiX/cmWIXSourceWriter.h              |   19 +++++++++-
 10 files changed, 79 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
CMake