OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Fri, 13 Feb 2015 15:11:51 +0000 (00:11 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Fri, 13 Feb 2015 15:11:51 +0000 (00:11 +0900)
commitc7741c912917dc2996b99fa1136401daf090238d
tree2174d229b014a0ada8f6d9f2549c1615521e7de4
parent613f75bd2fe61bca3d7691122ae72065ca064b77
parent697a65f5e04f9876c70e3c24558428b9b9a6db09
Merge with stable
Src/Common/PreferencesDlg.cpp
Src/Common/PreferencesDlg.h
Src/HexMergeDoc.cpp
Src/HexMergeFrm.cpp
Src/MainFrm.cpp
Src/Merge.vcxproj
Src/Merge.vcxproj.filters
Src/OptionsDef.h
Src/OptionsInit.cpp