[Cmake-commits] CMake branch, master, updated. v2.8.12.1-1003-gb5ef7fd

[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  b5ef7fd47e955e67d4f176d3a9124484b527ae81 (commit)
       via  37a1157aa90e33098ba0927321dda5ffb9e1472b (commit)
      from  4dd2382a6ede56b1228ed6da94a6a7925fe94d37 (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=b5ef7fd47e955e67d4f176d3a9124484b527ae81
commit b5ef7fd47e955e67d4f176d3a9124484b527ae81
Merge: 4dd2382 37a1157
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Dec 23 10:19:29 2013 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Dec 23 10:19:29 2013 -0500

    Merge topic 'wix-cmake-coding-conventions'
    
    37a1157 CPackWiX: adhere to CMake member naming convention


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

Summary of changes:
 Source/CPack/WiX/cmCPackWIXGenerator.cxx       |   50 +++++++++---------
 Source/CPack/WiX/cmCPackWIXGenerator.h         |   12 ++--
 Source/CPack/WiX/cmWIXPatchParser.cxx          |   36 ++++++------
 Source/CPack/WiX/cmWIXPatchParser.h            |   10 ++--
 Source/CPack/WiX/cmWIXRichTextFormatWriter.cxx |   28 +++++-----
 Source/CPack/WiX/cmWIXRichTextFormatWriter.h   |    2 +-
 Source/CPack/WiX/cmWIXSourceWriter.cxx         |   70 ++++++++++++------------
 Source/CPack/WiX/cmWIXSourceWriter.h           |    8 ++--
 8 files changed, 108 insertions(+), 108 deletions(-)


hooks/post-receive
-- 
CMake