[Cmake-commits] CMake branch, master, updated. v3.0.0-rc4-704-g658cc11

[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  658cc11cf19ed514f93afe3d837a0bd24377499d (commit)
       via  cb59f5da97723f648df78fd16d95697008d5d42b (commit)
      from  ba83d84714bff717b58ecb0c91df62ca91db3bb8 (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=658cc11cf19ed514f93afe3d837a0bd24377499d
commit 658cc11cf19ed514f93afe3d837a0bd24377499d
Merge: ba83d84 cb59f5d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 21 09:32:33 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 21 09:32:33 2014 -0400

    Merge topic 'fix-wix-cpack-crash'
    
    cb59f5da CPackWIX: Delay creation of cmWIXPatch until CPack has initialized Logger


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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx |   19 ++++++++++++++-----
 Source/CPack/WiX/cmCPackWIXGenerator.h   |    3 ++-
 2 files changed, 16 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake