OSDN Git Service

Merge with stable
authorsdottaka <none@none>
Sun, 22 Dec 2013 22:52:59 +0000 (07:52 +0900)
committersdottaka <none@none>
Sun, 22 Dec 2013 22:52:59 +0000 (07:52 +0900)
commit1bd5adb568e15534587a27bdb60c12c757e08d32
tree9a1dd2b23e8214c3893347983d17580f74dc31e4
parent8261a6744515a4380758869987c91d23a1f34102
parent08533a3cc054b9c1a64be037a1b3489a0921ebdc
Merge with stable
Src/MainFrm.cpp
Src/MainFrm.h
Src/MergeDoc.cpp
Src/PluginManager.h
Src/Plugins.cpp
Translations/WinMerge/English.pot