[Cmake-commits] CMake branch, master, updated. v3.2.0-377-g6f28bc6

[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  6f28bc6b511ff8052968c2a7d40a3dc5bcfcb2aa (commit)
       via  2e16aff1e2218f042f403971403fe583fc5bec97 (commit)
       via  b0852ebc09eec44041e8aa624ec4bb17bda14dac (commit)
      from  3f66bde4f70566166437dc4d7c9beaeba1ee33ee (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=6f28bc6b511ff8052968c2a7d40a3dc5bcfcb2aa
commit 6f28bc6b511ff8052968c2a7d40a3dc5bcfcb2aa
Merge: 3f66bde 2e16aff
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 9 09:45:57 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 9 09:45:57 2015 -0400

    Merge topic 'fix-wixobj-filenames'
    
    2e16aff1 CPackWIX: Fix .wixobj output locations and filenames.
    b0852ebc CPackWIX: Support patching of root <Feature> elements.


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

Summary of changes:
 Modules/CPackWIX.cmake                   |    6 ++++--
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   20 +++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake