OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sun, 21 Jun 2015 15:20:12 +0000 (00:20 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sun, 21 Jun 2015 15:20:12 +0000 (00:20 +0900)
commit7803de4fa28b0d43804bd99e9b8f538af368f1ee
tree05f5ddcf6ad27f06c58de89f08543efe6d629557
parentcc8dce0fe4dd8cb9fb4556dbdb9ad5a888240563
parent1d383297648a88c9e5f40c22abf34b979ffd1630
Merge with stable
13 files changed:
Src/HexMergeDoc.cpp
Src/IListCtrlImpl.h
Src/MainFrm.cpp
Src/Merge.cpp
Src/MergeEditView.cpp
Src/OptionsDef.h
Src/OptionsInit.cpp
Src/PluginsListDlg.cpp
Src/PropShell.cpp
Src/PropShell.h
Src/SelectUnpackerDlg.cpp
Src/paths.cpp
Translations/WinMerge/English.pot