merge到master

2018-12-23 15:09:24 +08:00
parent c3d163dfa8
commit bac637213b
35 changed files with 322 additions and 322 deletions
@@ -0,0 +1,51 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.28010.2041
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Interact", "Interact\Interact.csproj", "{CEF054AF-95B7-4B88-934E-02705FEEA554}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "StormChatWPF", "StormChatWPF\StormChatWPF.csproj", "{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Debug|x64.Build.0 = Debug|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Debug|x86.Build.0 = Debug|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Release|x64.ActiveCfg = Release|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Release|x64.Build.0 = Release|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Release|x86.ActiveCfg = Release|Any CPU
+		{CEF054AF-95B7-4B88-934E-02705FEEA554}.Release|x86.Build.0 = Release|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Debug|x64.Build.0 = Debug|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Debug|x86.Build.0 = Debug|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Release|x64.ActiveCfg = Release|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Release|x64.Build.0 = Release|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Release|x86.ActiveCfg = Release|Any CPU
+		{CF4D6BE0-A862-401F-A3A6-4FDAC32F5B70}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {16287CCA-1001-41B2-B0BA-101618B1DCFB}
+	EndGlobalSection
+EndGlobal