[Cmake-commits] CMake branch, master, updated. v3.0.2-1937-ga22570e

[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  a22570ea19904b08afae204f378c6f5febd7f534 (commit)
       via  d48c781fc2e637fd9605775f44f4360bec6a59d9 (commit)
      from  c38d9687caf34ce50a167b3187243b33a348ccb4 (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=a22570ea19904b08afae204f378c6f5febd7f534
commit a22570ea19904b08afae204f378c6f5febd7f534
Merge: c38d968 d48c781
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 29 09:21:45 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 29 09:21:45 2014 -0400

    Merge topic 'wix-directory-permissions'
    
    d48c781f CPackWiX: Extend CPACK_WIX_ACL to support directories


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

Summary of changes:
 Help/prop_inst/CPACK_WIX_ACL.rst            |    3 ++-
 Source/CPack/WiX/cmCPackWIXGenerator.cxx    |   30 ++++++++++++++++++++++++---
 Source/CPack/WiX/cmWIXFilesSourceWriter.cxx |   10 ++++++++-
 Source/CPack/WiX/cmWIXFilesSourceWriter.h   |    3 ++-
 Source/cmInstalledFile.cxx                  |    7 +++++++
 Source/cmInstalledFile.h                    |    2 ++
 6 files changed, 49 insertions(+), 6 deletions(-)


hooks/post-receive
-- 
CMake