[Cmake-commits] CMake branch, master, updated. v2.8.12.1-613-g3822f5b

[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  3822f5bcacf5076d8c1832e2dae57b47c1247f56 (commit)
       via  096591b96a0fb8cac2b330bc727c96ff90fa8d97 (commit)
      from  11fe43422fe046d966dda8ae513b2b0af4377503 (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=3822f5bcacf5076d8c1832e2dae57b47c1247f56
commit 3822f5bcacf5076d8c1832e2dae57b47c1247f56
Merge: 11fe434 096591b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Nov 13 09:56:30 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 13 09:56:30 2013 -0500

    Merge topic 'wix-custom-arguments'
    
    096591b CPackWiX: Add variables for custom tool extensions and flags


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

Summary of changes:
 Modules/CPackWIX.cmake                   |   24 ++++++++++-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   69 +++++++++++++++++++++++++++---
 Source/CPack/WiX/cmCPackWIXGenerator.h   |   10 ++++
 3 files changed, 96 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
CMake