From c5d4422fd6c6066f1eb82de62d163ea4bac29983 Mon Sep 17 00:00:00 2001 From: kichik Date: Fri, 4 Feb 2005 13:55:29 +0000 Subject: [PATCH] 2.04->2.05 git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3892 212acab6-be3b-0410-9dea-997c60f758d6 --- Examples/makensis.nsi | 8 ++++---- Menu/images/header.gif | Bin 6698 -> 6716 bytes Source/makenssi.cpp | 2 +- Source/script.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Examples/makensis.nsi b/Examples/makensis.nsi index 5cc48aa3..1d26ee7c 100644 --- a/Examples/makensis.nsi +++ b/Examples/makensis.nsi @@ -3,11 +3,11 @@ !define VER_MAJOR 2 !define VER_MINOR 0 -!define VER_REVISION 4 -!define VER_BUILD 22 +!define VER_REVISION 5 +!define VER_BUILD 0 -!define VER_FILE "204" -!define VER_DISPLAY "2.04" +!define VER_FILE "205" +!define VER_DISPLAY "2.05" ;-------------------------------- ;Compile CVS Data Setup diff --git a/Menu/images/header.gif b/Menu/images/header.gif index d17bebec8b218e03740bcd79616392becfe6b05c..5bd8caf00e2f844aaefe26504552a0ece211251d 100644 GIT binary patch delta 6412 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 delta 6385 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 Install System v2.04"; + const char *szXPManifest = k ? 0 : "Nullsoft Install System v2.05"; res_editor->UpdateResource(MAKEINTRESOURCE(24), MAKEINTRESOURCE(1), NSIS_DEFAULT_LANG, (unsigned char*)szXPManifest, k ? 0 : strlen(szXPManifest)); } catch (exception& err) {