OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Fri, 16 Jan 2015 11:36:21 +0000 (20:36 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Fri, 16 Jan 2015 11:36:21 +0000 (20:36 +0900)
commite0cde31a32067245e863aed2b450e983bb21e867
tree23a8368eb17b1a826e38d418e97adda4b6a75f4d
parentbb52d491477dbecf6aab4e56ad2011ff75c6790c
parented1d1bfd87f85881757caad7e1cf9a5b18cb05bc
Merge with stable
Src/DirActions.cpp
Src/ImgMergeFrm.cpp
Src/Merge.vcxproj
Src/Merge.vcxproj.filters
Src/OptionsDef.h
Src/PropCompareFolder.cpp
Translations/WinMerge/English.pot