[Cmake-commits] CMake branch, master, updated. v2.8.12.1-842-ged1de30

[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  ed1de30da06a22bc6d9cfd147a99f7728f175802 (commit)
       via  7b390f75e82ad79f6759656c52825c89e5c92902 (commit)
      from  55f2a3d62754001fe44209f513ed81f90dab9338 (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=ed1de30da06a22bc6d9cfd147a99f7728f175802
commit ed1de30da06a22bc6d9cfd147a99f7728f175802
Merge: 55f2a3d 7b390f7
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 2 12:07:24 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 2 12:07:24 2013 -0500

    Merge topic 'wix-components'
    
    7b390f7 CPackWiX: add CPack component support


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

Summary of changes:
 Modules/CPackWIX.cmake                   |    8 +
 Modules/WIX.template.in                  |    2 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |  306 ++++++++++++++++++++++++++----
 Source/CPack/WiX/cmCPackWIXGenerator.h   |   31 +++-
 Source/CPack/WiX/cmWIXSourceWriter.cxx   |    9 +
 Source/CPack/WiX/cmWIXSourceWriter.h     |    3 +
 Tests/CPackWiXGenerator/CMakeLists.txt   |   14 ++-
 7 files changed, 325 insertions(+), 48 deletions(-)


hooks/post-receive
-- 
CMake