OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Tue, 24 Feb 2015 14:58:57 +0000 (23:58 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Tue, 24 Feb 2015 14:58:57 +0000 (23:58 +0900)
commitb02b01322ff40a089816f91c17c469d6c7304677
tree07fbbdb26a10c593d0823f1ac4afeef362c5cf71
parenta785724112fb1fcd94c4a9c31921aec0a3c09eaf
parent003d7a68b5d14b5b5c270bf99c1060776beeeae2
Merge with stable
13 files changed:
Src/Common/PreferencesDlg.h
Src/DropHandler.cpp
Src/FileFiltersDlg.h
Src/MainFrm.cpp
Src/MainFrm.h
Src/Merge.cpp
Src/Merge.vcxproj
Src/Merge.vcxproj.filters
Src/OpenView.cpp
Src/StdAfx.h
Src/paths.cpp
Src/paths.h
Translations/WinMerge/English.pot