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)
commitd1d483075cd23a7c6f0e02d2eaf7b54144349c5d
tree07fbbdb26a10c593d0823f1ac4afeef362c5cf71
parentce179c06a6d9f3edfe9f470bc79eef5ba2bc2140
parentcbda2286c9faaba32faec3e73d7894ddca459423
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