Merge branch 'develop' of github.com:ethereum/cpp-ethereum into develop

Conflicts: libethereum/State.cpp
11 years ago · 1b86a90855
1 changed files with 1 additions and 1 deletions
--- a/windows/LibEthereum.props
+++ b/windows/LibEthereum.props
@ -11,7 +11,7 @@
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <DisableSpecificWarnings>4068;4127;4258;4244;4267;4505;4512;4706;4714</DisableSpecificWarnings>
+      <DisableSpecificWarnings>4068;4100;4127;4258;4244;4267;4505;4512;4706;4714</DisableSpecificWarnings>
      <WarningLevel>Level4</WarningLevel>
      <TreatWarningAsError>true</TreatWarningAsError>
      <MinimalRebuild>false</MinimalRebuild>