[Cmake-commits] CMake branch, master, updated. v3.6.2-910-gf27f6f8
Brad King
brad.king at kitware.com
Mon Sep 12 09:31:38 EDT 2016
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 f27f6f8f3fa571d656edba6f254bf47cea0bb6d8 (commit)
via c0bccc51df0eda22b4a7aa5833e1204412b39fc8 (commit)
from 58e56607c12789b41a722e03576c090584da4bf6 (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=f27f6f8f3fa571d656edba6f254bf47cea0bb6d8
commit f27f6f8f3fa571d656edba6f254bf47cea0bb6d8
Merge: 58e5660 c0bccc5
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 12 09:31:35 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 12 09:31:35 2016 -0400
Merge topic 'wix-feature-patch'
c0bccc51 CPackWIX: Enabled patching of WIX <Feature> tags
-----------------------------------------------------------------------
Summary of changes:
Help/release/dev/wix-feature-patch.rst | 5 +++++
Modules/CPackWIX.cmake | 2 +-
Source/CPack/WiX/cmCPackWIXGenerator.cxx | 4 ++--
Source/CPack/WiX/cmWIXFeaturesSourceWriter.cxx | 12 ++++++++----
Source/CPack/WiX/cmWIXFeaturesSourceWriter.h | 7 +++++--
5 files changed, 21 insertions(+), 9 deletions(-)
create mode 100644 Help/release/dev/wix-feature-patch.rst
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list