[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1037-g81311c6

[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  81311c670e02a554ba5e5c45329c4eda9c89bd72 (commit)
       via  950d76ed485bd98498fefa1eb63d86bda83d9159 (commit)
      from  2da175ce9d13ea4c16fdea1f808c1f661134ea05 (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=81311c670e02a554ba5e5c45329c4eda9c89bd72
commit 81311c670e02a554ba5e5c45329c4eda9c89bd72
Merge: 2da175c 950d76e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jan 2 14:24:25 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jan 2 14:24:25 2014 -0500

    Merge topic 'wix-rtf-encoding'
    
    950d76e CPackWiX: allow and convert UTF-8 sequences in RTF writer


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

Summary of changes:
 Modules/CPackWIX.cmake                         |    1 +
 Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx |   93 +++++++++++++++++++++++-
 Source/CPack/WiX/cmWIXRichTextFormatWriter.h   |    6 ++
 Tests/CPackWiXGenerator/CMakeLists.txt         |    2 +
 Tests/CPackWiXGenerator/license.txt            |    9 +++
 5 files changed, 110 insertions(+), 1 deletions(-)
 create mode 100644 Tests/CPackWiXGenerator/license.txt


hooks/post-receive
-- 
CMake