Microsoft Visual Studio Solution File, Format Version 11.00
# Visual Studio 2010
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Server", "server\Server.vcxproj", "{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}"
EndProject
Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Setup", "server setup\Server Setup.vdproj", "{514CF3EC-B559-47EF-9CB5-32D5A6A732DD}"
EndProject
Global
	GlobalSection(SubversionScc) = preSolution
		Svn-Managed = True
		Manager = AnkhSVN - Subversion Support for Visual Studio
	EndGlobalSection
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
		Debug|Win32 = Debug|Win32
<<<<<<< .mine
		FFMPEG 0.5|Win32 = FFMPEG 0.5|Win32
		no bluefish|Win32 = no bluefish|Win32
=======
		no_bluefish|Win32 = no_bluefish|Win32
>>>>>>> .r555
		Release|Win32 = Release|Win32
		WO Bluefish|Win32 = WO Bluefish|Win32
	EndGlobalSection
	GlobalSection(ProjectConfigurationPlatforms) = postSolution
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.ActiveCfg = Debug|Win32
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Debug|Win32.Build.0 = Debug|Win32
<<<<<<< .mine
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.FFMPEG 0.5|Win32.ActiveCfg = Release|Win32
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.FFMPEG 0.5|Win32.Build.0 = Release|Win32
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no bluefish|Win32.ActiveCfg = no_bluefish|Win32
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no bluefish|Win32.Build.0 = no_bluefish|Win32
=======
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no_bluefish|Win32.ActiveCfg = no_bluefish|Win32
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.no_bluefish|Win32.Build.0 = no_bluefish|Win32
>>>>>>> .r555
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.ActiveCfg = Release|Win32
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.Release|Win32.Build.0 = Release|Win32
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.WO Bluefish|Win32.ActiveCfg = Release|Win32
		{79388C20-6499-4BF6-B8B9-D8C33D7D4DDD}.WO Bluefish|Win32.Build.0 = Release|Win32
		{514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.Debug|Win32.ActiveCfg = Debug
		{514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.Debug|Win32.Build.0 = Debug
		{514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.FFMPEG 0.5|Win32.ActiveCfg = FFMPEG 0.5
		{514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.no bluefish|Win32.ActiveCfg = Release
		{514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.Release|Win32.ActiveCfg = Release
		{514CF3EC-B559-47EF-9CB5-32D5A6A732DD}.WO Bluefish|Win32.ActiveCfg = WO Bluefish
	EndGlobalSection
	GlobalSection(SolutionProperties) = preSolution
		HideSolutionNode = FALSE
	EndGlobalSection
EndGlobal