PATCH: [ 841062 ] Alternative icons for PATCH [ 840273 ] (for hilight line diff)

diff --git a/Src/Merge.rc b/Src/Merge.rc
index e2d358d..b5b06e7 100644 (file)
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -1,7 +1,5 @@
 //Microsoft Developer Studio generated resource script.
 //
-// $Id$
-
 #include "resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS
@@ -84,8 +82,10 @@ BEGIN
         MENUITEM SEPARATOR
         MENUITEM "Copy all diffs to other side...", 
                                                 ID_POPUP_COPYALLDIFFSTOOTHERSIDE
+
         MENUITEM "Copy all diffs from other side...", 
                                                 ID_POPUP_COPYALLDIFFSFROMOTHERSIDE
+
         MENUITEM SEPARATOR
         MENUITEM "Undo",                        ID_UNDO
         MENUITEM SEPARATOR
@@ -227,12 +227,14 @@ BEGIN
         BEGIN
             MENUITEM "with registered application", ID_DIR_OPEN_LEFT
             MENUITEM "with external editor",        ID_DIR_OPEN_LEFT_WITHEDITOR
+
             MENUITEM "with...",                     ID_DIR_OPEN_LEFT_WITH
         END
         POPUP "Open right"
         BEGIN
             MENUITEM "with registered application", ID_DIR_OPEN_RIGHT
             MENUITEM "with external editor",        ID_DIR_OPEN_RIGHT_WITHEDITOR
+
             MENUITEM "with...",                     ID_DIR_OPEN_RIGHT_WITH
         END
     END
@@ -908,6 +910,8 @@ BEGIN
     BUTTON      ID_EDIT_UNDO
     BUTTON      ID_EDIT_REDO
     SEPARATOR
+    BUTTON      ID_SHOWLINEDIFF
+    SEPARATOR
     BUTTON      ID_NEXTDIFF
     BUTTON      ID_PREVDIFF
     BUTTON      ID_LASTDIFF

diff --git a/Src/readme.txt b/Src/readme.txt
index 8c6f513..3310811 100644 (file)
--- a/Src/readme.txt
+++ b/Src/readme.txt
@@ -1,3 +1,9 @@
+2003-11-14 Laoran 
+  PATCH: [ 841062 ] Alternative icons for PATCH [ 840273 ] (for hilight line diff)
+  Submitted by Tim Gerundt
+   WinMerge: Merge.rc
+   res: Toolbar.bmp
+
 2003-11-14 Kimmo
  PATCH: [ 841767 ] Store unique item path
   Fixes bug: #840547 Copying unique file does not update date and size

diff --git a/Src/res/Toolbar.bmp b/Src/res/Toolbar.bmp
index 264bae3..e7d2380 100644 (file)
Binary files a/Src/res/Toolbar.bmp and b/Src/res/Toolbar.bmp differ