OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sat, 28 Feb 2015 14:34:41 +0000 (23:34 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sat, 28 Feb 2015 14:34:41 +0000 (23:34 +0900)
commitf4176635cf2f9c684a30f3b5c4f3c501d726eb73
tree4ac7adbfd9917b422d37256e1710ea5c074421f7
parentb02b01322ff40a089816f91c17c469d6c7304677
parent5d84ac9b3c07a37c4dabe029a3337f64bf1d2b0a
Merge with stable
Src/DirView.cpp
Src/DirView.h
Src/DropHandler.cpp
Src/MainFrm.cpp
Src/MainFrm.h
Src/OptionsDef.h
Src/OptionsInit.cpp
Src/PropShell.cpp
Src/PropShell.h
Translations/WinMerge/English.pot