[Cmake-commits] CMake branch, master, updated. v3.4.1-684-gc634b5d

[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  c634b5d4c5f5856be7b7ae163f34019b93175c51 (commit)
       via  ecdc77f14d7a37f9d173ea2ca4946bf51c6a43d0 (commit)
      from  63f2737993b5d0b0821bf7400c39266692713f16 (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=c634b5d4c5f5856be7b7ae163f34019b93175c51
commit c634b5d4c5f5856be7b7ae163f34019b93175c51
Merge: 63f2737 ecdc77f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Dec 11 09:43:48 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Dec 11 09:43:48 2015 -0500

    Merge topic 'wix-fix-comp-install-prop'
    
    ecdc77f1 CPackWIX: Fix installed file property lookups when using components


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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   23 +++++++++++++++++++----
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    3 +++
 2 files changed, 22 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake