From f9aa766dae5543baa907b6c8549de4b46d6d6f05 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Mon, 20 Apr 2015 07:33:59 -0400 Subject: [PATCH] Fixed project hierarchy --- ...Software.UserInterface.WindowsForms.csproj | 2 +- CSharp/UniversalEditor.WindowsForms.sln | 43 +++---------------- 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj index 7ff72cc9..7ceb4e9a 100644 --- a/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj +++ b/CSharp/Engines/WindowsForms/Plugins/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms/UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj @@ -4,7 +4,7 @@ Debug AnyCPU - {D804B16F-289B-4846-AE4A-6070F84389F6} + {14341BB8-05E4-4EF8-AD05-3D3073C1EF00} Library Properties UniversalEditor diff --git a/CSharp/UniversalEditor.WindowsForms.sln b/CSharp/UniversalEditor.WindowsForms.sln index 632ce2d8..a84b0c62 100644 --- a/CSharp/UniversalEditor.WindowsForms.sln +++ b/CSharp/UniversalEditor.WindowsForms.sln @@ -141,11 +141,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.Mic EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.RebelSoftware", "Plugins\UniversalEditor.Plugins.RebelSoftware\UniversalEditor.Plugins.RebelSoftware.csproj", "{311885BE-3FAF-430B-91B2-6EC135D3A8AB}" EndProject -<<<<<<< HEAD -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms", "UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms\UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj", "{D804B16F-289B-4846-AE4A-6070F84389F6}" -======= -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms", "Engines\WindowsForms\Plugins\UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms\UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj", "{D804B16F-289B-4846-AE4A-6070F84389F6}" ->>>>>>> ea7f0daeca2ea41e705b6cd2f772813ea7a9fd90 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms", "Engines\WindowsForms\Plugins\UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms\UniversalEditor.Plugins.RebelSoftware.UserInterface.WindowsForms.csproj", "{14341BB8-05E4-4EF8-AD05-3D3073C1EF00}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -386,10 +382,10 @@ Global {311885BE-3FAF-430B-91B2-6EC135D3A8AB}.Debug|Any CPU.Build.0 = Debug|Any CPU {311885BE-3FAF-430B-91B2-6EC135D3A8AB}.Release|Any CPU.ActiveCfg = Release|Any CPU {311885BE-3FAF-430B-91B2-6EC135D3A8AB}.Release|Any CPU.Build.0 = Release|Any CPU - {D804B16F-289B-4846-AE4A-6070F84389F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D804B16F-289B-4846-AE4A-6070F84389F6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D804B16F-289B-4846-AE4A-6070F84389F6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D804B16F-289B-4846-AE4A-6070F84389F6}.Release|Any CPU.Build.0 = Release|Any CPU + {14341BB8-05E4-4EF8-AD05-3D3073C1EF00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {14341BB8-05E4-4EF8-AD05-3D3073C1EF00}.Debug|Any CPU.Build.0 = Debug|Any CPU + {14341BB8-05E4-4EF8-AD05-3D3073C1EF00}.Release|Any CPU.ActiveCfg = Release|Any CPU + {14341BB8-05E4-4EF8-AD05-3D3073C1EF00}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -456,35 +452,8 @@ Global {997FFB89-0ED6-47EB-BD97-68B3138F91AD} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} {7BB04C9F-DC3F-448A-8FD3-9A6BB52BC886} = {71CFF024-26F7-4626-A526-B435FDF8D64E} {D623EC26-1A04-4BFE-84EE-E738281499C0} = {71CFF024-26F7-4626-A526-B435FDF8D64E} -<<<<<<< HEAD {E1A1FD87-BEA4-41B7-9472-B4E35A0630B5} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} {311885BE-3FAF-430B-91B2-6EC135D3A8AB} = {71CFF024-26F7-4626-A526-B435FDF8D64E} - {D804B16F-289B-4846-AE4A-6070F84389F6} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} -======= - {311885BE-3FAF-430B-91B2-6EC135D3A8AB} = {71CFF024-26F7-4626-A526-B435FDF8D64E} - {FE016EA3-DC31-4A92-8B0A-8C746EC117E1} = {46041F27-7C1C-4209-B72B-251EDB5D4C61} - {ED627DF7-3E78-4428-AB31-810BA1586E62} = {46041F27-7C1C-4209-B72B-251EDB5D4C61} - {C1F34183-7A2F-41A6-9958-F6F329099654} = {A846CA33-9CAA-4237-B14F-8721DBA89442} - {5A423A3E-51C5-4188-8AD5-FB5C0CB76C6A} = {C1F34183-7A2F-41A6-9958-F6F329099654} - {2013757E-4240-4E07-AD22-91219AD9B74F} = {C1F34183-7A2F-41A6-9958-F6F329099654} - {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} = {C1F34183-7A2F-41A6-9958-F6F329099654} - {54990D5E-CE09-459F-916E-AF13101765B4} = {C1F34183-7A2F-41A6-9958-F6F329099654} - {617D9EB5-CA93-45D6-AA6B-5A012B7698AC} = {5A423A3E-51C5-4188-8AD5-FB5C0CB76C6A} - {E0897B7B-617A-4709-A4C6-FC0F6B441B2A} = {5A423A3E-51C5-4188-8AD5-FB5C0CB76C6A} - {BCBB72BD-0ECB-4FF2-8D91-E466361FB6F9} = {2013757E-4240-4E07-AD22-91219AD9B74F} - {D8E59ADD-B591-49AF-B18E-6E0D4581700C} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {9B5ABDC3-ADF7-42B7-ADE9-8DC715310492} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {4250B20B-2DC9-432F-B0C2-BD20B80B4970} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {049A3447-14AF-4CAE-BE0E-1C42DD1AB1CB} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {EE70D9BB-52FB-4BF5-A704-06F4881301CF} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {F19919B7-1D51-4972-8E4A-E59D68D4926A} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {094E86E4-903B-493C-91EF-4597658748A9} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {F635B40D-4BC1-48CB-9FFD-38076D569640} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {997FFB89-0ED6-47EB-BD97-68B3138F91AD} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {E1A1FD87-BEA4-41B7-9472-B4E35A0630B5} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {D804B16F-289B-4846-AE4A-6070F84389F6} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} - {118E40C4-323E-4B4B-8EF4-38EED6CC5E83} = {54990D5E-CE09-459F-916E-AF13101765B4} - {A5A14A71-5DB3-4495-92F6-8D27C98FF0F4} = {BC6859FB-B61C-471D-9F84-613E5C388C52} ->>>>>>> ea7f0daeca2ea41e705b6cd2f772813ea7a9fd90 + {14341BB8-05E4-4EF8-AD05-3D3073C1EF00} = {D3CE7A47-3989-4B6D-9867-0EA3C8DD7AB1} EndGlobalSection EndGlobal