Mercurial > hg > easyhg-kdiff3
comparison kdiff3/src-QT4/ccInstHelper.cpp @ 112:0180c7f92563
Build fixes
author | Chris Cannam |
---|---|
date | Fri, 07 Dec 2018 13:40:01 +0000 |
parents | fcd146072e0c |
children |
comparison
equal
deleted
inserted
replaced
111:44fa471eb3c4 | 112:0180c7f92563 |
---|---|
15 // line to point to the exdll.h-file | 15 // line to point to the exdll.h-file |
16 #include "C:/Programme/NSIS/Contrib/ExDll/exdll.h" | 16 #include "C:/Programme/NSIS/Contrib/ExDll/exdll.h" |
17 #endif | 17 #endif |
18 | 18 |
19 struct ReplacementItem | 19 struct ReplacementItem |
20 { char* fileType; char* operationType; }; | 20 { const char* fileType; const char* operationType; }; |
21 | 21 |
22 ReplacementItem g_replacementTable[] = { | 22 ReplacementItem g_replacementTable[] = { |
23 {"text_file_delta", "xcompare"}, | 23 {"text_file_delta", "xcompare"}, |
24 {"text_file_delta", "xmerge"}, | 24 {"text_file_delta", "xmerge"}, |
25 {"whole_copy", "xcompare"}, | 25 {"whole_copy", "xcompare"}, |