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
@@ -495,7 +495,6 @@
    <ClInclude Include="include\DeckView.h" />
    <ClInclude Include="include\DuelLayers.h" />
    <ClInclude Include="include\Easing.h" />
-    <ClInclude Include="include\Effects.h" />
    <ClInclude Include="include\ExtraCost.h" />
    <ClInclude Include="include\GameApp.h" />
    <ClInclude Include="include\GameObserver.h" />
@@ -594,4 +593,4 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
-</Project>
+</Project>