[Cmake-commits] CMake branch, master, updated. v3.2.0-rc1-144-g7747e1a

[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  7747e1a7f6414e1d6308cd2b469246ed8e1a66c5 (commit)
       via  a2ccbffd8b4191f7b8b888fafde85eb5e7dbb2e4 (commit)
      from  f724ab5e78ec71b22c8b5dc9e894d3feb288c620 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7747e1a7f6414e1d6308cd2b469246ed8e1a66c5
commit 7747e1a7f6414e1d6308cd2b469246ed8e1a66c5
Merge: f724ab5 a2ccbff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 16 09:44:40 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 16 09:44:40 2015 -0500

    Merge topic 'wix-product-fragment'
    
    a2ccbffd CPackWIX: Extend the patching mechanism to allow adding content to <Product>.


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

Summary of changes:
 Modules/CPackWIX.cmake                   |    5 ++++-
 Modules/WIX.template.in                  |    1 +
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   14 +++++++++++++-
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    4 +++-
 4 files changed, 21 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake