Merge branch 'master' into minmax

2013-11-30 23:10:24 +01:00
parent a683f5a2b7 9effa7c975
commit 261a6e4780
114 changed files with 1110 additions and 973 deletions
@@ -366,9 +366,6 @@
    <ClInclude Include="include\CardDisplay.h">
      <Filter>inc</Filter>
    </ClInclude>
-    <ClInclude Include="include\CardEffect.h">
-      <Filter>inc</Filter>
-    </ClInclude>
    <ClInclude Include="include\CardGui.h">
      <Filter>inc</Filter>
    </ClInclude>
@@ -531,9 +528,6 @@
    <ClInclude Include="include\OptionItem.h">
      <Filter>inc</Filter>
    </ClInclude>
-    <ClInclude Include="include\OSD.h">
-      <Filter>inc</Filter>
-    </ClInclude>
    <ClInclude Include="include\PhaseRing.h">
      <Filter>inc</Filter>
    </ClInclude>