Manually merged pull request #222

[casparcg] / casparcg.sln

diff --git a/casparcg.sln b/casparcg.sln
index eac65b410bb6932b854eff12e059976778a78297..879216d5b3fa8bee0575ce8d179cdcf60699c5f4 100644 (file)
--- a/casparcg.sln
+++ b/casparcg.sln
@@ -1,19 +1,17 @@
 \r
-Microsoft Visual Studio Solution File, Format Version 11.00\r
-# Visual Studio 2010\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcxproj", "{02308602-7FE0-4253-B96E-22134919F56A}"\r
-EndProject\r
+Microsoft Visual Studio Solution File, Format Version 12.00\r
+# Visual Studio 2012\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "core\core.vcxproj", "{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shell", "shell\shell.vcxproj", "{8C26C94F-8092-4769-8D84-DEA479721C5B}"\r
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "protocol", "protocol\protocol.vcxproj", "{2040B361-1FB6-488E-84A5-38A580DA90DE}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mixer", "mixer\mixer.vcxproj", "{477E12A4-1B28-4FF7-B46D-76606BDD1891}"\r
-EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "documentation", "documentation", "{32079541-68ED-4319-91FB-0FF041642679}"\r
        ProjectSection(SolutionItems) = preProject\r
-               ..\CasparCG 2.0 Preliminary Change Log.txt = ..\CasparCG 2.0 Preliminary Change Log.txt\r
+               CHANGES.txt = CHANGES.txt\r
+               LICENSE.txt = LICENSE.txt\r
+               README.txt = README.txt\r
        EndProjectSection\r
 EndProject\r
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "modules", "modules", "{C54DA43E-4878-45DB-B76D-35970553672C}"\r
@@ -30,15 +28,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "oal", "modules\oal\oal.vcxp
 EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ogl", "modules\ogl\ogl.vcxproj", "{88F974F0-D09F-4788-8CF8-F563209E60C1}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "silverlight", "modules\silverlight\silverlight.vcxproj", "{B964D953-8882-454C-A935-DB711D697E39}"\r
-EndProject\r
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "image", "modules\image\image.vcxproj", "{3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}"\r
 EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "common\common.vcxproj", "{02308602-7FE0-4253-B96E-22134919F56A}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "newtek", "modules\newtek\newtek.vcxproj", "{29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}"\r
+EndProject\r
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "html", "modules\html\html.vcxproj", "{701A5E6E-DB53-4503-834D-263C6A18189A}"\r
+EndProject\r
 Global\r
-       GlobalSection(SubversionScc) = preSolution\r
-               Svn-Managed = True\r
-               Manager = AnkhSVN - Subversion Support for Visual Studio\r
-       EndGlobalSection\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Win32 = Debug|Win32\r
                Develop|Win32 = Develop|Win32\r
@@ -46,14 +44,6 @@ Global
                Release|Win32 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
-               {02308602-7FE0-4253-B96E-22134919F56A}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {02308602-7FE0-4253-B96E-22134919F56A}.Debug|Win32.Build.0 = Debug|Win32\r
-               {02308602-7FE0-4253-B96E-22134919F56A}.Develop|Win32.ActiveCfg = Develop|Win32\r
-               {02308602-7FE0-4253-B96E-22134919F56A}.Develop|Win32.Build.0 = Develop|Win32\r
-               {02308602-7FE0-4253-B96E-22134919F56A}.Profile|Win32.ActiveCfg = Profile|Win32\r
-               {02308602-7FE0-4253-B96E-22134919F56A}.Profile|Win32.Build.0 = Profile|Win32\r
-               {02308602-7FE0-4253-B96E-22134919F56A}.Release|Win32.ActiveCfg = Release|Win32\r
-               {02308602-7FE0-4253-B96E-22134919F56A}.Release|Win32.Build.0 = Release|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.Build.0 = Debug|Win32\r
                {79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Develop|Win32.ActiveCfg = Develop|Win32\r
@@ -78,14 +68,6 @@ Global
                {2040B361-1FB6-488E-84A5-38A580DA90DE}.Profile|Win32.Build.0 = Profile|Win32\r
                {2040B361-1FB6-488E-84A5-38A580DA90DE}.Release|Win32.ActiveCfg = Release|Win32\r
                {2040B361-1FB6-488E-84A5-38A580DA90DE}.Release|Win32.Build.0 = Release|Win32\r
-               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Debug|Win32.Build.0 = Debug|Win32\r
-               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Develop|Win32.ActiveCfg = Develop|Win32\r
-               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Develop|Win32.Build.0 = Develop|Win32\r
-               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Profile|Win32.ActiveCfg = Profile|Win32\r
-               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Profile|Win32.Build.0 = Profile|Win32\r
-               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Release|Win32.ActiveCfg = Release|Win32\r
-               {477E12A4-1B28-4FF7-B46D-76606BDD1891}.Release|Win32.Build.0 = Release|Win32\r
                {69313D25-9F54-4FC9-9872-628A4DD79464}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {69313D25-9F54-4FC9-9872-628A4DD79464}.Debug|Win32.Build.0 = Debug|Win32\r
                {69313D25-9F54-4FC9-9872-628A4DD79464}.Develop|Win32.ActiveCfg = Develop|Win32\r
@@ -134,14 +116,6 @@ Global
                {88F974F0-D09F-4788-8CF8-F563209E60C1}.Profile|Win32.Build.0 = Profile|Win32\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1}.Release|Win32.ActiveCfg = Release|Win32\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1}.Release|Win32.Build.0 = Release|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Debug|Win32.Build.0 = Debug|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Develop|Win32.ActiveCfg = Develop|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Develop|Win32.Build.0 = Develop|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Profile|Win32.ActiveCfg = Profile|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Profile|Win32.Build.0 = Profile|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Release|Win32.ActiveCfg = Release|Win32\r
-               {B964D953-8882-454C-A935-DB711D697E39}.Release|Win32.Build.0 = Release|Win32\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}.Debug|Win32.ActiveCfg = Debug|Win32\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}.Debug|Win32.Build.0 = Debug|Win32\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}.Develop|Win32.ActiveCfg = Develop|Win32\r
@@ -150,6 +124,30 @@ Global
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}.Profile|Win32.Build.0 = Profile|Win32\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}.Release|Win32.ActiveCfg = Release|Win32\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2}.Release|Win32.Build.0 = Release|Win32\r
+               {02308602-7FE0-4253-B96E-22134919F56A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {02308602-7FE0-4253-B96E-22134919F56A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {02308602-7FE0-4253-B96E-22134919F56A}.Develop|Win32.ActiveCfg = Develop|Win32\r
+               {02308602-7FE0-4253-B96E-22134919F56A}.Develop|Win32.Build.0 = Develop|Win32\r
+               {02308602-7FE0-4253-B96E-22134919F56A}.Profile|Win32.ActiveCfg = Profile|Win32\r
+               {02308602-7FE0-4253-B96E-22134919F56A}.Profile|Win32.Build.0 = Profile|Win32\r
+               {02308602-7FE0-4253-B96E-22134919F56A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {02308602-7FE0-4253-B96E-22134919F56A}.Release|Win32.Build.0 = Release|Win32\r
+               {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Debug|Win32.Build.0 = Debug|Win32\r
+               {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Develop|Win32.ActiveCfg = Develop|Win32\r
+               {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Develop|Win32.Build.0 = Develop|Win32\r
+               {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Profile|Win32.ActiveCfg = Profile|Win32\r
+               {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Profile|Win32.Build.0 = Profile|Win32\r
+               {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Release|Win32.ActiveCfg = Release|Win32\r
+               {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE}.Release|Win32.Build.0 = Release|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Debug|Win32.ActiveCfg = Debug|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Debug|Win32.Build.0 = Debug|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Develop|Win32.ActiveCfg = Develop|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Develop|Win32.Build.0 = Develop|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Profile|Win32.ActiveCfg = Profile|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Profile|Win32.Build.0 = Profile|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Release|Win32.ActiveCfg = Release|Win32\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A}.Release|Win32.Build.0 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
@@ -161,7 +159,8 @@ Global
                {816DEABA-3757-4306-AFE0-C27CF96C4DEA} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {82ED7ED6-8A15-40EC-A8AF-F5E712E0DA68} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {88F974F0-D09F-4788-8CF8-F563209E60C1} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
-               {B964D953-8882-454C-A935-DB711D697E39} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
                {3E11FF65-A9DA-4F80-87F2-A7C6379ED5E2} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
+               {29CCB0C0-A1B7-4C05-BFEC-486C9A0B78CE} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
+               {701A5E6E-DB53-4503-834D-263C6A18189A} = {C54DA43E-4878-45DB-B76D-35970553672C}\r
        EndGlobalSection\r
 EndGlobal\r