File tree
74 files changed
+1450
-2077
lines changed- ArchiveSupport/Merge7z
- Externals
- crystaledit/Sample
- Installer/InnoSetup
- Plugins
- WinMerge32BitPluginProxy
- dlls
- ARM
- x86
- src_VCPP
- DisplayBinaryFiles
- DisplayXMLFiles
- EditBinaryFiles
- HideFirstLetter
- IgnoreColumns
- IgnoreCommentsC
- IgnoreFieldsComma
- IgnoreFieldsTab
- WatchBeginningOfLog
- WatchEndOfLog
- ShellExtension
- ShellExtension
- WinMergeContextMenu
- Src
- Testing
- FolderCompare
- GoogleTest/GUITests
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
74 files changed
+1450
-2077
lines changed+217-217
Large diffs are not rendered by default.
+217-217
Large diffs are not rendered by default.
+217-217
Large diffs are not rendered by default.
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 | 2 |
| |
3 | 3 |
| |
4 |
| - | |
| 4 | + | |
5 | 5 |
| |
6 | 6 |
| |
7 | 7 |
| |
8 | 8 |
| |
9 |
| - | |
| 9 | + | |
10 | 10 |
| |
| 11 | + | |
11 | 12 |
| |
12 | 13 |
| |
13 | 14 |
| |
| |||
21 | 22 |
| |
22 | 23 |
| |
23 | 24 |
| |
24 |
| - | |
25 |
| - | |
26 |
| - | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
27 | 28 |
| |
28 |
| - | |
29 | 29 |
| |
30 | 30 |
| |
31 |
| - | |
32 | 31 |
| |
| 32 | + | |
33 | 33 |
| |
34 | 34 |
| |
35 |
| - | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
36 | 38 |
| |
37 |
| - | |
| 39 | + | |
38 | 40 |
| |
39 |
| - | |
40 |
| - | |
41 |
| - | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
42 | 44 |
| |
43 |
| - | |
| 45 | + | |
44 | 46 |
| |
45 | 47 |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
12 |
| - | |
| 12 | + | |
13 | 13 |
| |
| 14 | + | |
14 | 15 |
| |
15 | 16 |
| |
16 | 17 |
| |
| |||
19 | 20 |
| |
20 | 21 |
| |
21 | 22 |
| |
22 |
| - | |
23 |
| - | |
24 |
| - | |
25 |
| - | |
26 |
| - | |
27 |
| - | |
28 |
| - | |
| 23 | + | |
29 | 24 |
| |
30 | 25 |
| |
31 | 26 |
| |
32 |
| - | |
| 27 | + | |
33 | 28 |
| |
34 | 29 |
| |
35 |
| - | |
36 |
| - | |
| 30 | + | |
| 31 | + | |
37 | 32 |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
12 |
| - | |
| 12 | + | |
13 | 13 |
| |
| 14 | + | |
14 | 15 |
| |
15 | 16 |
| |
16 | 17 |
| |
| |||
19 | 20 |
| |
20 | 21 |
| |
21 | 22 |
| |
22 |
| - | |
23 |
| - | |
24 |
| - | |
25 |
| - | |
26 |
| - | |
27 |
| - | |
28 |
| - | |
| 23 | + | |
29 | 24 |
| |
30 | 25 |
| |
31 | 26 |
| |
32 |
| - | |
| 27 | + | |
33 | 28 |
| |
34 | 29 |
| |
35 |
| - | |
36 |
| - | |
| 30 | + | |
| 31 | + | |
37 | 32 |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
12 |
| - | |
| 12 | + | |
13 | 13 |
| |
| 14 | + | |
14 | 15 |
| |
15 | 16 |
| |
16 | 17 |
| |
| |||
19 | 20 |
| |
20 | 21 |
| |
21 | 22 |
| |
22 |
| - | |
23 |
| - | |
24 |
| - | |
25 |
| - | |
26 |
| - | |
27 |
| - | |
28 |
| - | |
| 23 | + | |
29 | 24 |
| |
30 | 25 |
| |
31 | 26 |
| |
32 |
| - | |
| 27 | + | |
33 | 28 |
| |
34 | 29 |
| |
35 |
| - | |
36 |
| - | |
| 30 | + | |
| 31 | + | |
37 | 32 |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
144 | 144 |
| |
145 | 145 |
| |
146 | 146 |
| |
147 |
| - | |
148 |
| - | |
149 |
| - | |
150 |
| - | |
151 |
| - | |
152 |
| - | |
153 |
| - | |
154 |
| - | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
155 | 155 |
| |
156 | 156 |
| |
157 | 157 |
| |
158 | 158 |
| |
159 |
| - | |
160 |
| - | |
161 |
| - | |
162 |
| - | |
163 |
| - | |
164 |
| - | |
165 |
| - | |
166 |
| - | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
167 | 167 |
| |
168 | 168 |
| |
169 | 169 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
12 | 11 |
| |
| 12 | + | |
13 | 13 |
| |
14 | 14 |
| |
15 |
| - | |
16 | 15 |
| |
| 16 | + | |
17 | 17 |
| |
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
23 |
| - | |
24 |
| - | |
25 | 23 |
| |
26 | 24 |
| |
| 25 | + | |
| 26 | + | |
27 | 27 |
| |
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 |
| - | |
32 |
| - | |
33 | 31 |
| |
34 | 32 |
| |
| 33 | + | |
| 34 | + | |
35 | 35 |
| |
36 | 36 |
| |
37 | 37 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
8 | 8 |
| |
9 | 9 |
| |
10 | 10 |
| |
11 |
| - | |
12 | 11 |
| |
| 12 | + | |
13 | 13 |
| |
14 | 14 |
| |
15 |
| - | |
16 | 15 |
| |
| 16 | + | |
17 | 17 |
| |
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
23 |
| - | |
24 |
| - | |
25 | 23 |
| |
26 | 24 |
| |
| 25 | + | |
| 26 | + | |
27 | 27 |
| |
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 |
| - | |
32 |
| - | |
33 | 31 |
| |
34 | 32 |
| |
| 33 | + | |
| 34 | + | |
35 | 35 |
| |
36 | 36 |
| |
37 | 37 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
9 | 9 |
| |
10 | 10 |
| |
11 | 11 |
| |
12 |
| - | |
13 | 12 |
| |
| 13 | + | |
14 | 14 |
| |
15 | 15 |
| |
16 |
| - | |
17 | 16 |
| |
| 17 | + | |
18 | 18 |
| |
19 | 19 |
| |
20 | 20 |
| |
21 | 21 |
| |
22 | 22 |
| |
23 | 23 |
| |
24 |
| - | |
25 |
| - | |
26 | 24 |
| |
27 | 25 |
| |
| 26 | + | |
| 27 | + | |
28 | 28 |
| |
29 | 29 |
| |
30 | 30 |
| |
31 | 31 |
| |
32 |
| - | |
33 |
| - | |
34 | 32 |
| |
35 | 33 |
| |
| 34 | + | |
| 35 | + | |
36 | 36 |
| |
37 | 37 |
| |
38 | 38 |
| |
|
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 | 2 |
| |
3 | 3 |
| |
4 |
| - | |
| 4 | + | |
| 5 | + | |
| 6 | + | |
| 7 | + | |
5 | 8 |
| |
6 | 9 |
| |
7 | 10 |
| |
|
0 commit comments