[Cmake-commits] CMake branch, master, updated. v2.8.12-275-g69fd125

[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  69fd12583c18e42338aabfa67cd1791571a2c86e (commit)
       via  2e6cadde13690a80bc3919cec00e802208367f32 (commit)
      from  cd36929c278d69c00850144932d931676ed5f889 (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=69fd12583c18e42338aabfa67cd1791571a2c86e
commit 69fd12583c18e42338aabfa67cd1791571a2c86e
Merge: cd36929 2e6cadd
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Oct 15 09:33:22 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 15 09:33:22 2013 -0400

    Merge topic 'wix-extra-sources'
    
    2e6cadd CPackWiX: allow user supplied extra sources, objects and libraries


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

Summary of changes:
 Modules/CPackWIX.cmake                   |   14 ++++++++++++++
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   28 ++++++++++++++++++++++++++++
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    4 ++++
 3 files changed, 46 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake