From 11dbb0e1c83b91d13094570b469bbf55492c0dae Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@zeromus.org>
Date: Sun, 27 Oct 2013 07:52:20 +0000
Subject: [PATCH] reapply moves with merge tracking

---
 .../BinarySaveStates.cs                       |  0
 .../ControllerBinding.cs                      |  0
 .../PathManager.cs                            |  0
 .../SavestateManager.cs                       |  0
 .../XmlGame.cs                                |  0
 .../tools}/RamSearchEngine.cs                 |  0
 .../tools}/WatchList.cs                       |  0
 .../MruStack.cs                               |  0
 .../UndoHistory.cs                            |  0
 BizHawk.MultiClient/tools/NES/MovieConvert.cs | 40 -------------------
 10 files changed, 40 deletions(-)
 rename {BizHawk.MultiClient => BizHawk.Client.Common}/BinarySaveStates.cs (100%)
 rename {BizHawk.MultiClient/Input => BizHawk.Client.Common}/ControllerBinding.cs (100%)
 rename {BizHawk.MultiClient/config => BizHawk.Client.Common}/PathManager.cs (100%)
 rename {BizHawk.MultiClient => BizHawk.Client.Common}/SavestateManager.cs (100%)
 rename {BizHawk.MultiClient => BizHawk.Client.Common}/XmlGame.cs (100%)
 rename {BizHawk.MultiClient/tools/Watch => BizHawk.Client.Common/tools}/RamSearchEngine.cs (100%)
 rename {BizHawk.MultiClient/tools/Watch => BizHawk.Client.Common/tools}/WatchList.cs (100%)
 rename {BizHawk.MultiClient => BizHawk.Common}/MruStack.cs (100%)
 rename BizHawk.MultiClient/tools/Watch/WatchHistory.cs => BizHawk.Common/UndoHistory.cs (100%)
 delete mode 100644 BizHawk.MultiClient/tools/NES/MovieConvert.cs

diff --git a/BizHawk.MultiClient/BinarySaveStates.cs b/BizHawk.Client.Common/BinarySaveStates.cs
similarity index 100%
rename from BizHawk.MultiClient/BinarySaveStates.cs
rename to BizHawk.Client.Common/BinarySaveStates.cs
diff --git a/BizHawk.MultiClient/Input/ControllerBinding.cs b/BizHawk.Client.Common/ControllerBinding.cs
similarity index 100%
rename from BizHawk.MultiClient/Input/ControllerBinding.cs
rename to BizHawk.Client.Common/ControllerBinding.cs
diff --git a/BizHawk.MultiClient/config/PathManager.cs b/BizHawk.Client.Common/PathManager.cs
similarity index 100%
rename from BizHawk.MultiClient/config/PathManager.cs
rename to BizHawk.Client.Common/PathManager.cs
diff --git a/BizHawk.MultiClient/SavestateManager.cs b/BizHawk.Client.Common/SavestateManager.cs
similarity index 100%
rename from BizHawk.MultiClient/SavestateManager.cs
rename to BizHawk.Client.Common/SavestateManager.cs
diff --git a/BizHawk.MultiClient/XmlGame.cs b/BizHawk.Client.Common/XmlGame.cs
similarity index 100%
rename from BizHawk.MultiClient/XmlGame.cs
rename to BizHawk.Client.Common/XmlGame.cs
diff --git a/BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs b/BizHawk.Client.Common/tools/RamSearchEngine.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/RamSearchEngine.cs
rename to BizHawk.Client.Common/tools/RamSearchEngine.cs
diff --git a/BizHawk.MultiClient/tools/Watch/WatchList.cs b/BizHawk.Client.Common/tools/WatchList.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/WatchList.cs
rename to BizHawk.Client.Common/tools/WatchList.cs
diff --git a/BizHawk.MultiClient/MruStack.cs b/BizHawk.Common/MruStack.cs
similarity index 100%
rename from BizHawk.MultiClient/MruStack.cs
rename to BizHawk.Common/MruStack.cs
diff --git a/BizHawk.MultiClient/tools/Watch/WatchHistory.cs b/BizHawk.Common/UndoHistory.cs
similarity index 100%
rename from BizHawk.MultiClient/tools/Watch/WatchHistory.cs
rename to BizHawk.Common/UndoHistory.cs
diff --git a/BizHawk.MultiClient/tools/NES/MovieConvert.cs b/BizHawk.MultiClient/tools/NES/MovieConvert.cs
deleted file mode 100644
index cda25a13df..0000000000
--- a/BizHawk.MultiClient/tools/NES/MovieConvert.cs
+++ /dev/null
@@ -1,40 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace BizHawk.MultiClient.movie
-{
-    public static class MovieConvert
-    {
-        public static void ConvertFCM(string path)
-        {
-
-        }
-
-        public static void ConvertMMV(string path)
-        {
-
-        }
-
-        public static void ConvertMCM(string path)
-        {
-
-        }
-
-        public static void ConvertSMV(string path)
-        {
-
-        }
-
-        public static void ConvertGMV(string path)
-        {
-
-        }
-
-        public static void ConvertVBM(string path)
-        {
-
-        }
-    }
-}