OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Mon, 29 Dec 2014 15:13:24 +0000 (00:13 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Mon, 29 Dec 2014 15:13:24 +0000 (00:13 +0900)
commitbbf7a6efec91d82a6915a0824406de86252bfeee
treef16122011bc264b2f4ec1d593a6203831d8d536c
parentc263cf56afce05c207f4e790ed9e077e80b880a0
parent5d38a90f3d79b2c0cac5ab9015c697a705ffa0e8
Merge with stable
19 files changed:
Src/AboutDlg.cpp
Src/DiffContext.cpp
Src/DirActions.cpp
Src/DirActions.h
Src/DirDoc.cpp
Src/DirItemIterator.h
Src/ImgMergeFrm.cpp
Src/MainFrm.cpp
Src/Merge.cpp
Src/Merge.h
Src/Merge.vcxproj
Src/Merge.vcxproj.filters
Src/MergeApp.cpp
Src/MergeApp.h
Src/OptionsDef.h
Src/OptionsInit.cpp
Src/PropGeneral.cpp
Src/PropGeneral.h
Translations/WinMerge/English.pot