[Cmake-commits] CMake branch, master, updated. v3.4.0-rc1-57-gc997595

[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  c997595ea36b60803068fafdbe0f7041b3cc9da0 (commit)
       via  3758af12fab8bc3c6279400621be94c4aa540a70 (commit)
      from  3cf71728a17899673f7a07dea9d0242e7d7bff1f (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=c997595ea36b60803068fafdbe0f7041b3cc9da0
commit c997595ea36b60803068fafdbe0f7041b3cc9da0
Merge: 3cf7172 3758af1
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Oct 8 10:31:48 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Oct 8 10:31:48 2015 -0400

    Merge topic 'cpack-nsis-bitmap'
    
    3758af12 CPackNSIS: Add options to set the bitmap for NSIS installer left side


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

Summary of changes:
 Help/release/dev/cpack-nsis-bitmap.rst |    6 ++++++
 Modules/CPackNSIS.cmake                |    8 ++++++++
 Modules/NSIS.template.in               |    2 ++
 Source/CPack/cmCPackNSISGenerator.cxx  |   22 ++++++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 Help/release/dev/cpack-nsis-bitmap.rst


hooks/post-receive
-- 
CMake