OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Fri, 8 May 2015 11:25:55 +0000 (20:25 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Fri, 8 May 2015 11:25:55 +0000 (20:25 +0900)
commit30b352f131f042293d15fcbbd798de9159efdaf3
tree5dca4081bc2528433c7d81d6f51a16788d9a0e57
parent3f48959844a470686f82a9028094828e6a2dd207
parent132ccf6d77a77b5bc1f83535565fa58574da72de
Merge with stable
Src/AboutDlg.cpp
Src/LoadSaveCodepageDlg.cpp
Src/LoadSaveCodepageDlg.h
Src/Merge.vcxproj
Src/Merge.vcxproj.filters
Src/PropArchive.h
Translations/WinMerge/English.pot