[Cmake-commits] CMake branch, next, updated. v3.5.2-841-g68e77a5

[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, next has been updated
       via  68e77a5f3048019731b59e91b1e303f7a13f83a7 (commit)
       via  e847b6c86455682377dea8cd53e182c00a3e2d3c (commit)
      from  667fa6f4fad2141543bca97b74fb956df4d5a9ec (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=68e77a5f3048019731b59e91b1e303f7a13f83a7
commit 68e77a5f3048019731b59e91b1e303f7a13f83a7
Merge: 667fa6f e847b6c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 2 11:51:06 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jun 2 11:51:06 2016 -0400

    Merge topic 'cpack-nsis-remove-duplicate-include' into next
    
    e847b6c8 CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132)


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e847b6c86455682377dea8cd53e182c00a3e2d3c
commit e847b6c86455682377dea8cd53e182c00a3e2d3c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Jun 2 11:49:07 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Jun 2 11:49:44 2016 -0400

    CPack/NSIS: Remove duplicate include from NSIS.template.in (#16132)
    
    In commit v2.6.0~3438 (ENH: Better support for adding and removing path,
    2006-04-27) an include of "WinMessages.NSH" was added without removing
    the original include.  Remove it now.

diff --git a/Modules/NSIS.template.in b/Modules/NSIS.template.in
index 1ef3d28..2de9e1d 100644
--- a/Modules/NSIS.template.in
+++ b/Modules/NSIS.template.in
@@ -157,13 +157,6 @@ Var AR_RegFlags
   !define MUI_HEADERIMAGE
   !define MUI_ABORTWARNING
 
-;--------------------------------
-; path functions
-
-!verbose 3
-!include "WinMessages.NSH"
-!verbose 4
-
 ;----------------------------------------
 ; based upon a script of "Written by KiCHiK 2003-01-18 05:57:02"
 ;----------------------------------------

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

Summary of changes:
 Modules/NSIS.template.in |    7 -------
 1 file changed, 7 deletions(-)


hooks/post-receive
-- 
CMake