[Cmake-commits] CMake branch, master, updated. v2.8.12.2-1386-g27d3974

[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  27d3974c66f42f1f37fb60d0e07cd9dd2ee912cf (commit)
       via  b78d74de64c989444210b203fb8f1183b2fd0929 (commit)
      from  6e149e1591249d4666b4f7eefd58f414c4b5d973 (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=27d3974c66f42f1f37fb60d0e07cd9dd2ee912cf
commit 27d3974c66f42f1f37fb60d0e07cd9dd2ee912cf
Merge: 6e149e1 b78d74d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 10 11:24:56 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 10 11:24:56 2014 -0500

    Merge topic 'wix_desktop'
    
    b78d74de CPackWiX: Add support for CPACK_CREATE_DESKTOP_LINKS


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

Summary of changes:
 Modules/CPack.cmake                      |    4 +-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |  103 +++++++++++++++++++++++++++++-
 Source/CPack/WiX/cmCPackWIXGenerator.h   |   12 ++++
 Tests/CPackWiXGenerator/CMakeLists.txt   |    5 ++
 4 files changed, 121 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake