OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@sourceforge.net>
Thu, 2 Oct 2014 18:13:55 +0000 (03:13 +0900)
committersdottaka <sdottaka@sourceforge.net>
Thu, 2 Oct 2014 18:13:55 +0000 (03:13 +0900)
commitc6ab52009ef1d02958de6d4c19ab8cb64d121c48
treeb32f204bce1eadb55d72b0ab123f5639810dca90
parent108ed2f83b8d0baea6f2af18c68ed65713d93bf5
parentd00569becbf3ec4a7b375e912ca836dd2527d9dd
Merge with stable
21 files changed:
Src/Common/LanguageSelect.cpp
Src/Common/LanguageSelect.h
Src/Common/MDITabBar.cpp
Src/Common/RegOptionsMgr.cpp
Src/Common/RegOptionsMgr.h
Src/CompareEngines/ByteCompare.cpp
Src/CompareEngines/TimeSizeCompare.cpp
Src/DiffWrapper.cpp
Src/DirDoc.cpp
Src/DirDoc.h
Src/DirView.cpp
Src/DirView.h
Src/MainFrm.cpp
Src/MainFrm.h
Src/Merge.cpp
Src/Merge.h
Src/MergeDoc.cpp
Src/MergeEditView.cpp
Src/MergeEditView.h
Src/Plugins.cpp
Src/VSSHelper.cpp