PATCH: [ 823924 ] Update about box and copyright year

diff --git a/Src/Merge.rc b/Src/Merge.rc
index aee35ff..b356119 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -296,7 +296,7 @@ END
 // Dialog
 //
 
-IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 223, 122
+IDD_ABOUTBOX DIALOG DISCARDABLE  0, 0, 223, 134
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "About WinMerge"
 FONT 8, "MS Sans Serif"
@@ -307,13 +307,17 @@ BEGIN
     LTEXT           "Version 1.0",IDC_VERSION,63,23,84,8,SS_NOPREFIX
     LTEXT           "(Private Build)",IDC_PRIVATEBUILD,63,33,153,8
     LTEXT           "All rights reserved.",IDC_STATIC,7,60,170,8
-    LTEXT           "Visit the WinMerge HomePage!",IDC_WWW,7,107,209,8
-    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,103,209,1
-    LTEXT           "© 2000 Thingamahoochie Software",IDC_COMPANY,7,49,209,8
+    LTEXT           "Visit the WinMerge HomePage!",IDC_WWW,7,119,209,8
+    CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDHORZ,7,113,209,1
+    LTEXT           "[VERSION COPYRIGHT GOES HERE]",IDC_COMPANY,7,49,209,8
     LTEXT           "Syntax Highlighting Edit View by Andrei Stcherbatchenko ",
                     IDC_STATIC,7,71,209,8
     LTEXT           "Various Syntaxes by Ferdinand Prantl",IDC_STATIC,7,81,
                     209,8
+    LTEXT           "Other major contributors include:",IDC_STATIC,7,91,209,
+                    8
+    LTEXT           "Christian List, Perry Rapp, Kimmo Varis, Laurent Ganier",
+                    IDC_STATIC,7,101,209,8
 END
 
 IDD_OPEN DIALOGEX 0, 0, 356, 115

diff --git a/Src/readme.txt b/Src/readme.txt
index 9572cfd..180ce02 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -2,6 +2,8 @@
  PATCH: [ 828633 ] Abort running scan
   WinMerge: DiffThread.cpp DiffThread.h DirDoc.cpp DirDoc.h
    DirScan.cpp DirScan.h
+ PATCH: [ 823924 ] Update about box and copyright year
+  WinMerge: Merge.rc
 
 2003-10-24 Perry
  PATCH: [ 814832 ] Timing traces for loading file