[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-222-g088fcbf

[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  088fcbf733a7d1968fc3586a7077f22cb41e1917 (commit)
       via  5a266095ee778fb700c067c55ff0b59777a72c50 (commit)
      from  ad3ff60f4a026d94fba7530325278ecd93a7357d (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=088fcbf733a7d1968fc3586a7077f22cb41e1917
commit 088fcbf733a7d1968fc3586a7077f22cb41e1917
Merge: ad3ff60 5a26609
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Oct 14 13:36:02 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 14 13:36:02 2015 -0400

    Merge topic 'wix-text-node'
    
    5a266095 CPackWIX: Handle text nodes in XML patch content


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

Summary of changes:
 Source/CPack/WiX/cmWIXPatch.cxx        |   32 ++++++++++++++------
 Source/CPack/WiX/cmWIXPatch.h          |    3 ++
 Source/CPack/WiX/cmWIXPatchParser.cxx  |   52 +++++++++++++++++++++++++++-----
 Source/CPack/WiX/cmWIXPatchParser.h    |   29 ++++++++++++++++--
 Source/CPack/WiX/cmWIXSourceWriter.cxx |   19 ++++++++++++
 Source/CPack/WiX/cmWIXSourceWriter.h   |    2 ++
 6 files changed, 118 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
CMake