WIP

Author: sdottaka

LICENSE_LibXDiff.txt

@@ -0,0 +1,20 @@
+/*
+ *  LibXDiff by Davide Libenzi ( File Differential Library )
+ *  Copyright (C) 2003  Davide Libenzi
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, see
+ *  <http://www.gnu.org/licenses/>.
+ *
+ *  Davide Libenzi <[email protected]>
+ */

src/WinWebDiff/Resource.h

@@ -18,18 +18,31 @@
 #define IDM_VIEW_SIZE_1280x800  124
 #define IDM_VIEW_SIZE_1440x900  125
 #define IDM_VIEW_SPLITHORIZONTALLY 126
-#define IDM_COMPARE_SCREENSHOTS 130
-#define IDM_COMPARE_FULLSIZE_SCREENSHOTS 131
-#define IDM_COMPARE_HTML        132
-#define IDM_COMPARE_TEXT        133
-#define IDM_COMPARE_RESOURCE_TREE         134
-#define IDM_CLEAR_DISK_CACHE    135
-#define IDM_CLEAR_COOKIES       136
-#define IDM_CLEAR_BROWSING_HISTORY 137
-#define IDM_CLEAR_ALL_PROFILE   138
-#define IDI_WINWEBDIFF			140
-#define IDI_SMALL				141
-#define IDC_WINWEBDIFF			142
+#define IDM_VIEW_VIEWDIFFERENCES 127
+#define IDM_VIEW_DIFF_ALGORITHM_MYERS 128
+#define IDM_VIEW_DIFF_ALGORITHM_MINIMAL 129
+#define IDM_VIEW_DIFF_ALGORITHM_PATIENCE 130
+#define IDM_VIEW_DIFF_ALGORITHM_HISTOGRAM 131
+#define IDM_VIEW_DIFF_ALGORITHM_NONE 132
+#define IDM_COMPARE_RECOMPARE 140
+#define IDM_COMPARE_SCREENSHOTS 141
+#define IDM_COMPARE_FULLSIZE_SCREENSHOTS 142
+#define IDM_COMPARE_HTML        143
+#define IDM_COMPARE_TEXT        144
+#define IDM_COMPARE_RESOURCE_TREE         145
+#define IDM_COMPARE_NEXTDIFFERENCE 146
+#define IDM_COMPARE_PREVIOUSDIFFERENCE 147
+#define IDM_COMPARE_FIRSTDIFFERENCE 148
+#define IDM_COMPARE_LASTDIFFERENCE 149
+#define IDM_COMPARE_NEXTCONFLICT 150
+#define IDM_COMPARE_PREVIOUSCONFLICT 151
+#define IDM_CLEAR_DISK_CACHE    161
+#define IDM_CLEAR_COOKIES       162
+#define IDM_CLEAR_BROWSING_HISTORY 163
+#define IDM_CLEAR_ALL_PROFILE   164
+#define IDI_WINWEBDIFF			170
+#define IDI_SMALL				171
+#define IDC_WINWEBDIFF			172
 #define IDC_MYICON				2
 #ifndef IDC_STATIC
 #define IDC_STATIC				-1
@@ -40,7 +53,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 
 #define _APS_NO_MFC					130
-#define _APS_NEXT_RESOURCE_VALUE	129
+#define _APS_NEXT_RESOURCE_VALUE	180
 #define _APS_NEXT_COMMAND_VALUE		32771
 #define _APS_NEXT_CONTROL_VALUE		1000
 #define _APS_NEXT_SYMED_VALUE		111