[Cmake-commits] CMake branch, master, updated. v2.8.5-114-gab24bde

[David Cole]

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  ab24bdeecc985f197d637cb593008ae29ae882cb (commit)
       via  e6d2bcfde2c0cd254ce1461e368ff79eb0010473 (commit)
      from  abc85867169a92f189d6378e95d062f24aa1bd93 (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=ab24bdeecc985f197d637cb593008ae29ae882cb
commit ab24bdeecc985f197d637cb593008ae29ae882cb
Merge: abc8586 e6d2bcf
Author:     David Cole <david.cole at kitware.com>
AuthorDate: Tue Aug 2 15:10:47 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 2 15:10:47 2011 -0400

    Merge topic 'cpack-nsis-multi-installs'
    
    e6d2bcf CPack/NSIS: Fix reinstall and multiple install issues when using components.


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

Summary of changes:
 Modules/CPack.cmake                   |    2 +-
 Modules/NSIS.template.in              |   20 ++++++++++----------
 Source/CPack/cmCPackNSISGenerator.cxx |    4 ----
 3 files changed, 11 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
CMake