Merge pull request #187 from Asnivor/dev

Production release 0.5.18.1
Asnivor · Sep 25, 2017 · 799e49d · 799e49d
2 parents 3d843c9 + 2add863
commit 799e49d
Show file tree

Hide file tree

Showing 266 changed files with 15,712 additions and 10,564 deletions.
diff --git a/.gitignore b/.gitignore
@@ -262,3 +262,4 @@ ModelManifest.xml
 /MedLaunch/Data/System/DAT/TRURIP
 /MedLaunch/Data/System/DAT/REDUMP
 /MedLaunch/Data/System/DATMaster - Copy.json
+/BuildTools/ftpcreds.txt
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "MednaNet"]
+	path = MednaNet
+	url = https://github.com/Asnivor/MednaNet
diff --git a/Asnitech.SQLite/Asnitech.SQLite.csproj b/Asnitech.SQLite/Asnitech.SQLite.csproj
diff --git a/Asnitech.SQLite/packages.config b/Asnitech.SQLite/packages.config
diff --git a/BizHawk.Emulation.DiscSystem/API_MednaDisc.cs b/BizHawk.Emulation.DiscSystem/API_MednaDisc.cs
diff --git a/BizHawk.Emulation.DiscSystem/BizHawk.Common.dll b/BizHawk.Emulation.DiscSystem/BizHawk.Common.dll