OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sat, 29 Nov 2014 08:34:37 +0000 (17:34 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sat, 29 Nov 2014 08:34:37 +0000 (17:34 +0900)
commit6d5082b69cb5315c246cd3a7350bf35c853fd79e
tree0e76d176e6b1b219e00d5b10f224f6c4eb65ef50
parented6eecd59b5a0f76d49a7d68443dace741982f7d
parentd3120232e809364739c9759dce934d055c688aae
Merge with stable
32 files changed:
Src/AboutDlg.h
Src/CCPrompt.h
Src/Common/UnicodeString.h
Src/Common/unicoder.cpp
Src/CompareEngines/TimeSizeCompare.cpp
Src/DiffContext.cpp
Src/DiffContext.h
Src/DirDoc.cpp
Src/DirDoc.h
Src/DirTravel.cpp
Src/DirView.cpp
Src/DirView.h
Src/DirViewColItems.cpp
Src/EditorFilepathBar.cpp
Src/EditorFilepathBar.h
Src/FileActionScript.h
Src/FileFilterHelper.cpp
Src/ImgMergeFrm.cpp
Src/LocationView.cpp
Src/MainFrm.cpp
Src/MainFrm.h
Src/Merge.h
Src/MergeDoc.cpp
Src/MergeDocLineDiffs.cpp
Src/PluginManager.h
Src/Plugins.cpp
Src/SelectUnpackerDlg.h
Src/StdAfx.h
Src/VssPrompt.h
Src/WMGotoDlg.h
Src/WaitStatusCursor.h
Translations/WinMerge/English.pot