Răsfoiți Sursa

Merge branch 'is-6' into anchors

Martijn Laan 6 ani în urmă
părinte
comite
ff15cddedc

+ 3 - 3
ISHelp/isetup.xml

@@ -3,7 +3,7 @@
 
 
 <!--
 <!--
   Inno Setup
   Inno Setup
-  Copyright (C) 1997-2018 Jordan Russell
+  Copyright (C) 1997-2019 Jordan Russell
   Portions by Martijn Laan
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
   For conditions of distribution and use, see LICENSE.TXT.
 -->
 -->
@@ -87,8 +87,8 @@
 
 
 <p>
 <p>
 <b>Inno Setup version 6.0.0</b><br/>
 <b>Inno Setup version 6.0.0</b><br/>
-<b>Copyright &copy; 1997-2018 Jordan Russell. All rights reserved.</b><br/>
-<b>Portions Copyright &copy; 2000-2018 Martijn Laan. All rights reserved.</b><br/>
+<b>Copyright &copy; 1997-2019 Jordan Russell. All rights reserved.</b><br/>
+<b>Portions Copyright &copy; 2000-2019 Martijn Laan. All rights reserved.</b><br/>
 <extlink href="http://www.jrsoftware.org/">Inno Setup home page</extlink>
 <extlink href="http://www.jrsoftware.org/">Inno Setup home page</extlink>
 </p>
 </p>
 
 

+ 2 - 2
Projects/CompForm.pas

@@ -2219,8 +2219,8 @@ begin
     String(FCompilerVersion.Version) + SNewLine;
     String(FCompilerVersion.Version) + SNewLine;
   if FCompilerVersion.Title <> 'Inno Setup' then
   if FCompilerVersion.Title <> 'Inno Setup' then
     S := S + (SNewLine + 'Based on Inno Setup' + SNewLine);
     S := S + (SNewLine + 'Based on Inno Setup' + SNewLine);
-  S := S + ('Copyright (C) 1997-2018 Jordan Russell' + SNewLine +
-    'Portions Copyright (C) 2000-2018 Martijn Laan' + SNewLine +
+  S := S + ('Copyright (C) 1997-2019 Jordan Russell' + SNewLine +
+    'Portions Copyright (C) 2000-2019 Martijn Laan' + SNewLine +
     'All rights reserved.' + SNewLine2 +
     'All rights reserved.' + SNewLine2 +
     'Inno Setup home page:' + SNewLine +
     'Inno Setup home page:' + SNewLine +
     'http://www.innosetup.com/' + SNewLine2 +
     'http://www.innosetup.com/' + SNewLine2 +

BIN
Projects/Compil32.res


+ 3 - 3
Projects/Compile.pas

@@ -2,7 +2,7 @@ unit Compile;
 
 
 {
 {
   Inno Setup
   Inno Setup
-  Copyright (C) 1997-2018 Jordan Russell
+  Copyright (C) 1997-2019 Jordan Russell
   Portions by Martijn Laan
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
   For conditions of distribution and use, see LICENSE.TXT.
 
 
@@ -9263,8 +9263,8 @@ begin
     AddStatus('');
     AddStatus('');
     for I := 0 to WarningsList.Count-1 do
     for I := 0 to WarningsList.Count-1 do
       AddStatus(SCompilerStatusWarning + WarningsList[I], True);
       AddStatus(SCompilerStatusWarning + WarningsList[I], True);
-    asm jmp @1; db 0,'Inno Setup Compiler, Copyright (C) 1997-2018 Jordan Russell, '
-                  db 'Portions Copyright (C) 2000-2018 Martijn Laan',0; @1: end;
+    asm jmp @1; db 0,'Inno Setup Compiler, Copyright (C) 1997-2019 Jordan Russell, '
+                  db 'Portions Copyright (C) 2000-2019 Martijn Laan',0; @1: end;
     { Note: Removing or modifying the copyright text is a violation of the
     { Note: Removing or modifying the copyright text is a violation of the
       Inno Setup license agreement; see LICENSE.TXT. }
       Inno Setup license agreement; see LICENSE.TXT. }
   finally
   finally

+ 3 - 3
Projects/ISCC.dpr

@@ -3,7 +3,7 @@ program ISCC;
 
 
 {
 {
   Inno Setup
   Inno Setup
-  Copyright (C) 1997-2018 Jordan Russell
+  Copyright (C) 1997-2019 Jordan Russell
   Portions by Martijn Laan
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
   For conditions of distribution and use, see LICENSE.TXT.
 
 
@@ -344,8 +344,8 @@ procedure ProcessCommandLine;
   procedure ShowBanner;
   procedure ShowBanner;
   begin
   begin
     WriteStdOut('Inno Setup 5 Command-Line Compiler');
     WriteStdOut('Inno Setup 5 Command-Line Compiler');
-    WriteStdOut('Copyright (C) 1997-2018 Jordan Russell. All rights reserved.');
-    WriteStdOut('Portions Copyright (C) 2000-2018 Martijn Laan');
+    WriteStdOut('Copyright (C) 1997-2019 Jordan Russell. All rights reserved.');
+    WriteStdOut('Portions Copyright (C) 2000-2019 Martijn Laan');
     if IsppMode then begin
     if IsppMode then begin
       WriteStdOut('Inno Setup Preprocessor');
       WriteStdOut('Inno Setup Preprocessor');
       WriteStdOut('Copyright (C) 2001-2004 Alex Yackimoff. All rights reserved.');
       WriteStdOut('Copyright (C) 2001-2004 Alex Yackimoff. All rights reserved.');

BIN
Projects/ISCC.res


BIN
Projects/ISCmplr.res


BIN
Projects/ISPP/ISPP.res


+ 3 - 3
Projects/Main.pas

@@ -2,7 +2,7 @@ unit Main;
 
 
 {
 {
   Inno Setup
   Inno Setup
-  Copyright (C) 1997-2018 Jordan Russell
+  Copyright (C) 1997-2019 Jordan Russell
   Portions by Martijn Laan
   Portions by Martijn Laan
   For conditions of distribution and use, see LICENSE.TXT.
   For conditions of distribution and use, see LICENSE.TXT.
 
 
@@ -3768,8 +3768,8 @@ begin
   S := SetupTitle + ' version ' + SetupVersion + SNewLine;
   S := SetupTitle + ' version ' + SetupVersion + SNewLine;
   if SetupTitle <> 'Inno Setup' then
   if SetupTitle <> 'Inno Setup' then
     S := S + (SNewLine + 'Based on Inno Setup' + SNewLine);
     S := S + (SNewLine + 'Based on Inno Setup' + SNewLine);
-  S := S + ('Copyright (C) 1997-2018 Jordan Russell' + SNewLine +
-    'Portions Copyright (C) 2000-2018 Martijn Laan' + SNewLine +
+  S := S + ('Copyright (C) 1997-2019 Jordan Russell' + SNewLine +
+    'Portions Copyright (C) 2000-2019 Martijn Laan' + SNewLine +
     'All rights reserved.' + SNewLine2 +
     'All rights reserved.' + SNewLine2 +
     'Inno Setup home page:' + SNewLine +
     'Inno Setup home page:' + SNewLine +
     'http://www.innosetup.com/');
     'http://www.innosetup.com/');

+ 2 - 2
README.md

@@ -1,8 +1,8 @@
 Inno Setup
 Inno Setup
 ==========
 ==========
 
 
-Copyright (C) 1997-2018 Jordan Russell. All rights reserved.  
-Portions Copyright (C) 2000-2018 Martijn Laan. All rights reserved.  
+Copyright (C) 1997-2019 Jordan Russell. All rights reserved.  
+Portions Copyright (C) 2000-2019 Martijn Laan. All rights reserved.  
 For conditions of distribution and use, see LICENSE.TXT.
 For conditions of distribution and use, see LICENSE.TXT.
 
 
 Source code README
 Source code README

+ 2 - 2
license.txt

@@ -4,8 +4,8 @@ Inno Setup License
 Except where otherwise noted, all of the documentation and software included
 Except where otherwise noted, all of the documentation and software included
 in the Inno Setup package is copyrighted by Jordan Russell.
 in the Inno Setup package is copyrighted by Jordan Russell.
 
 
-Copyright (C) 1997-2018 Jordan Russell. All rights reserved.
-Portions Copyright (C) 2000-2018 Martijn Laan. All rights reserved.
+Copyright (C) 1997-2019 Jordan Russell. All rights reserved.
+Portions Copyright (C) 2000-2019 Martijn Laan. All rights reserved.
 
 
 This software is provided "as-is," without any express or implied warranty.
 This software is provided "as-is," without any express or implied warranty.
 In no event shall the author be held liable for any damages arising from the use of this software.
 In no event shall the author be held liable for any damages arising from the use of this software.

+ 2 - 2
setup.iss

@@ -1,5 +1,5 @@
 ; Inno Setup
 ; Inno Setup
-; Copyright (C) 1997-2018 Jordan Russell. All rights reserved.
+; Copyright (C) 1997-2019 Jordan Russell. All rights reserved.
 ; Portions by Martijn Laan
 ; Portions by Martijn Laan
 ; For conditions of distribution and use, see LICENSE.TXT.
 ; For conditions of distribution and use, see LICENSE.TXT.
 ;
 ;
@@ -13,7 +13,7 @@ AppPublisher=jrsoftware.org
 AppPublisherURL=http://www.innosetup.com/
 AppPublisherURL=http://www.innosetup.com/
 AppSupportURL=http://www.innosetup.com/
 AppSupportURL=http://www.innosetup.com/
 AppUpdatesURL=http://www.innosetup.com/
 AppUpdatesURL=http://www.innosetup.com/
-VersionInfoCopyright=Copyright (C) 1997-2018 Jordan Russell. Portions Copyright (C) 2000-2018 Martijn Laan.
+VersionInfoCopyright=Copyright (C) 1997-2019 Jordan Russell. Portions Copyright (C) 2000-2019 Martijn Laan.
 AppMutex=InnoSetupCompilerAppMutex,Global\InnoSetupCompilerAppMutex
 AppMutex=InnoSetupCompilerAppMutex,Global\InnoSetupCompilerAppMutex
 SetupMutex=InnoSetupCompilerSetupMutex,Global\InnoSetupCompilerSetupMutex
 SetupMutex=InnoSetupCompilerSetupMutex,Global\InnoSetupCompilerSetupMutex
 WizardStyle=modern
 WizardStyle=modern

+ 2 - 2
whatsnew.htm

@@ -21,8 +21,8 @@
 
 
 <div class="bluehead"><span class="head1">Inno Setup 6</span><br /><span class="head2">Revision History</span></div>
 <div class="bluehead"><span class="head1">Inno Setup 6</span><br /><span class="head2">Revision History</span></div>
 
 
-<p>Copyright &copy; 1997-2018 <a href="http://www.jrsoftware.org/">Jordan Russell</a>. All rights reserved.<br />
-Portions Copyright &copy; 2000-2018 Martijn Laan. All rights reserved.<br />
+<p>Copyright &copy; 1997-2019 <a href="http://www.jrsoftware.org/">Jordan Russell</a>. All rights reserved.<br />
+Portions Copyright &copy; 2000-2019 Martijn Laan. All rights reserved.<br />
 For conditions of distribution and use, see <a href="http://www.jrsoftware.org/files/is/license.txt">LICENSE.TXT</a>.
 For conditions of distribution and use, see <a href="http://www.jrsoftware.org/files/is/license.txt">LICENSE.TXT</a>.
 </p>
 </p>