OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge with stable
[winmerge-jp/winmerge-jp.git]
/
Src
/
MergeApp.cpp
diff --git
a/Src/MergeApp.cpp
b/Src/MergeApp.cpp
index
f9e3666
..
5d10639
100644
(file)
--- a/
Src/MergeApp.cpp
+++ b/
Src/MergeApp.cpp
@@
-5,6
+5,7
@@
#include "paths.h"
#include "Environment.h"
#include "Constants.h"
+#include "unicoder.h"
// Get user language description of error, if available
String GetSysError(int nerr /* =-1 */)