Merge with stable

diff --cc Src/Common/PreferencesDlg.cpp
Simple merge

diff --cc Src/Common/PreferencesDlg.h
Simple merge

diff --cc Src/HexMergeDoc.cpp
Simple merge

diff --cc Src/HexMergeFrm.cpp
Simple merge

diff --cc Src/MainFrm.cpp
Simple merge

diff --cc Src/Merge.vcxproj
Simple merge

diff --cc Src/Merge.vcxproj.filters
index 457e6d0,9d5be0a..d9b2fd5
--- 1/Src/Merge.vcxproj.filters
--- 2/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@@ -742,18 -757,9 +742,21 @@@
      <ClCompile Include="CompareEngines\BinaryCompare.cpp">\r
        <Filter>Compare Engines</Filter>\r
      </ClCompile>\r
+     <ClCompile Include="PropCompareBinary.cpp">\r
+       <Filter>MFCGui\Dialogs\PropertyPages</Filter>\r
+     </ClCompile>\r
 +    <ClCompile Include="SourceControl.cpp">\r
 +      <Filter>Source Files</Filter>\r
 +    </ClCompile>\r
 +    <ClCompile Include="DirViewColItems.cpp">\r
 +      <Filter>Source Files</Filter>\r
 +    </ClCompile>\r
 +    <ClCompile Include="DirActions.cpp">\r
 +      <Filter>Source Files</Filter>\r
 +    </ClCompile>\r
 +    <ClCompile Include="CustomStatusCursor.cpp">\r
 +      <Filter>MFCGui\Source Files</Filter>\r
 +    </ClCompile>\r
    </ItemGroup>\r
    <ItemGroup>\r
      <ClInclude Include="charsets.h">\r

diff --cc Src/OptionsDef.h
Simple merge

diff --cc Src/OptionsInit.cpp
Simple merge