[Cmake-commits] CMake branch, master, updated. v3.2.1-531-g136a534

[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  136a534f7242e7a0352763158c4807b616860df8 (commit)
       via  98a3b2e29ece5195e7948681a410bc5fae880a23 (commit)
      from  aa15ef8a840f1451cf88040f1e3ab8ee0fce87fb (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=136a534f7242e7a0352763158c4807b616860df8
commit 136a534f7242e7a0352763158c4807b616860df8
Merge: aa15ef8 98a3b2e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 30 09:27:45 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 30 09:27:45 2015 -0400

    Merge topic 'wix-fix-utf8'
    
    98a3b2e2 CPackWIX: Omit codepage conversion when internal encoding is already UTF-8.


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

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


hooks/post-receive
-- 
CMake