[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1130-g1857660

[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  1857660984e4981ab00070d75e734b7f49d6d9fa (commit)
       via  92c4d4039e6f3c981e8b42d98240e53b8c33bdaf (commit)
      from  9551b85a907c10867c466b3cd4d26904acea48f0 (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=1857660984e4981ab00070d75e734b7f49d6d9fa
commit 1857660984e4981ab00070d75e734b7f49d6d9fa
Merge: 9551b85 92c4d40
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jan 8 09:58:45 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 8 09:58:45 2014 -0500

    Merge topic 'wix-cmake-package-registry'
    
    92c4d40 CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variable


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

Summary of changes:
 Modules/CPackWIX.cmake                   |   11 +++++++
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   43 +++++++++++++++++++++++++++++-
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    3 ++
 3 files changed, 56 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake