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)
commit54fb6076b70ef45d17234ed1cd8e371fa30f339d
tree5dca4081bc2528433c7d81d6f51a16788d9a0e57
parente46a09264012e530fe02aed0cf707a0382ffe6d9
parent48e57970844fea98dab4f9f252c8d8d035d7511e
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