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)
commit758c6236e1289ed62208a2befc55887504959d60
tree05f5ddcf6ad27f06c58de89f08543efe6d629557
parentb920178450d79cc2bfdecbf5d3096903984c9581
parentcf95f25aef7bb4bf4d7142b8a225099aa0cd9648
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