Merge remote-tracking branch 'origin/master'

ImaginaryDevelopment · Jul 4, 2019 · 4822041 · 4822041
2 parents cfeeff1 + d28b4bb
commit 4822041
Show file tree

Hide file tree

Showing 72 changed files with 2,706 additions and 5,878 deletions.
diff --git a/Hero Designer.sln b/Hero Designer.sln
@@ -17,6 +17,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "midsControls", "midsControls\midsControls.csproj", "{8B762616-CA1E-428A-A62D-E17DD738712D}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "HeroDesigner.ZLib", "HeroDesigner.ZLib\HeroDesigner.ZLib.fsproj", "{518ECE50-17A7-4C9F-BA19-0EA7320D0895}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -35,6 +37,10 @@ Global
 		{8B762616-CA1E-428A-A62D-E17DD738712D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8B762616-CA1E-428A-A62D-E17DD738712D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8B762616-CA1E-428A-A62D-E17DD738712D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{518ECE50-17A7-4C9F-BA19-0EA7320D0895}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{518ECE50-17A7-4C9F-BA19-0EA7320D0895}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{518ECE50-17A7-4C9F-BA19-0EA7320D0895}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{518ECE50-17A7-4C9F-BA19-0EA7320D0895}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE