From 6b975946b9f6055b88effc5aff26b3672922f28c Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Fri, 4 Feb 2011 00:20:53 +0000
Subject: [PATCH] Merge the Fusion class back into Board.

---
 win32/monsterz.vcxproj         | 2 --
 win32/monsterz.vcxproj.filters | 2 --
 2 files changed, 4 deletions(-)

diff --git a/win32/monsterz.vcxproj b/win32/monsterz.vcxproj
index f4b6ab4d..7be7eee3 100644
--- a/win32/monsterz.vcxproj
+++ b/win32/monsterz.vcxproj
@@ -12,7 +12,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\monsterz\board.h" />
-    <ClInclude Include="..\monsterz\fusion.h" />
     <ClInclude Include="..\monsterz\interface.h" />
     <ClInclude Include="..\monsterz\mash.h" />
     <ClInclude Include="..\monsterz\monsterz.h" />
@@ -52,7 +51,6 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\monsterz\board.cpp" />
-    <ClCompile Include="..\monsterz\fusion.cpp" />
     <ClCompile Include="..\monsterz\interface.cpp" />
     <ClCompile Include="..\monsterz\mash.cpp" />
     <ClCompile Include="..\monsterz\monsterz.cpp" />
diff --git a/win32/monsterz.vcxproj.filters b/win32/monsterz.vcxproj.filters
index 4e42b915..83ca1083 100644
--- a/win32/monsterz.vcxproj.filters
+++ b/win32/monsterz.vcxproj.filters
@@ -88,7 +88,6 @@
       <Filter>lolengine</Filter>
     </ClInclude>
     <ClInclude Include="..\monsterz\board.h" />
-    <ClInclude Include="..\monsterz\fusion.h" />
     <ClInclude Include="..\monsterz\interface.h" />
     <ClInclude Include="..\monsterz\piece.h" />
     <ClInclude Include="..\monsterz\thumbs.h" />
@@ -176,7 +175,6 @@
       <Filter>lolengine</Filter>
     </ClCompile>
     <ClCompile Include="..\monsterz\board.cpp" />
-    <ClCompile Include="..\monsterz\fusion.cpp" />
     <ClCompile Include="..\monsterz\interface.cpp" />
     <ClCompile Include="..\monsterz\monsterz.cpp" />
     <ClCompile Include="..\monsterz\piece.cpp" />