[Cmake-commits] CMake branch, master, updated. v2.8.12-470-gcd553c3

[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  cd553c34d618afba1312f4a4b1d289c7ba094d63 (commit)
       via  fe7f8c99a459f93df594a8e5c5f49389d71ae128 (commit)
      from  d36d5d8ffeac0b0d8b49e1ffb75c66fc33cc944f (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=cd553c34d618afba1312f4a4b1d289c7ba094d63
commit cd553c34d618afba1312f4a4b1d289c7ba094d63
Merge: d36d5d8 fe7f8c9
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Sat Oct 26 10:28:50 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sat Oct 26 10:28:50 2013 -0400

    Merge topic 'wix-fix-shortcut-ids'
    
    fe7f8c9 CPackWiX: use safe IDs for generated start menu shortcuts


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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |  270 +++++++++++++++++-------------
 Source/CPack/WiX/cmCPackWIXGenerator.h   |   21 ++-
 Source/CPack/WiX/cmWIXSourceWriter.cxx   |   29 +++-
 Source/CPack/WiX/cmWIXSourceWriter.h     |    4 +-
 Tests/CPackWiXGenerator/CMakeLists.txt   |   14 +-
 Tests/CPackWiXGenerator/myotherapp.cpp   |    1 +
 6 files changed, 210 insertions(+), 129 deletions(-)
 create mode 100644 Tests/CPackWiXGenerator/myotherapp.cpp


hooks/post-receive
-- 
CMake