Merge branch 'master' into minmax

2014-08-07 22:29:41 +02:00
parent 541698f98e d7628b3eb2
commit 656ab78cf5
21 changed files with 347 additions and 320 deletions
@@ -420,9 +420,6 @@
    <ClInclude Include="include\DuelLayers.h">
      <Filter>inc</Filter>
    </ClInclude>
-    <ClInclude Include="include\Effects.h">
-      <Filter>inc</Filter>
-    </ClInclude>
    <ClInclude Include="include\ExtraCost.h">
      <Filter>inc</Filter>
    </ClInclude>
@@ -731,4 +728,4 @@
      <Filter>res</Filter>
    </ResourceCompile>
  </ItemGroup>
-</Project>
+</Project>