add *.vcproj to .gitattributes

.gitattributes

@@ -3,5 +3,6 @@
 *.h         text diff=cpp
 *.cpp       text diff=cpp
 
+*.vcproj    text merge=union
 *.csproj    text merge=union
 *.sln       text merge=union eol=crlf

CefSharp/CefSharp.vcproj

@@ -1,393 +1,393 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="CefSharp"
-	ProjectGUID="{7B495581-2271-4F41-9476-ACB86E8C864F}"
-	RootNamespace="CefSharp"
-	Keyword="ManagedCProj"
-	TargetFrameworkVersion="131072"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			OutputDirectory="bin\$(ConfigurationName)"
-			IntermediateDirectory="obj\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			ManagedExtensions="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				Optimization="0"
-				AdditionalIncludeDirectories="$(SolutionDir)"
-				PreprocessorDefinitions="_DEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT"
-				RuntimeLibrary="3"
-				UsePrecompiledHeader="2"
-				GenerateXMLDocumentationFiles="true"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				IgnoreImportLibrary="false"
-				LinkLibraryDependencies="false"
-				AdditionalDependencies="opengl32.lib glu32.lib libcef.lib libcef_dll_wrapper.lib"
-				ShowProgress="1"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(SolutionDir)libs\$(ConfigurationName)\"
-				IgnoreAllDefaultLibraries="false"
-				IgnoreDefaultLibraryNames=""
-				GenerateDebugInformation="true"
-				AssemblyDebug="1"
-				TargetMachine="1"
-				KeyFile="$(SolutionDir)\CefSharp.snk"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			OutputDirectory="bin\$(ConfigurationName)"
-			IntermediateDirectory="obj\$(ConfigurationName)"
-			ConfigurationType="2"
-			CharacterSet="1"
-			ManagedExtensions="1"
-			WholeProgramOptimization="1"
-			>
-			<Tool
-				Name="VCPreBuildEventTool"
-			/>
-			<Tool
-				Name="VCCustomBuildTool"
-			/>
-			<Tool
-				Name="VCXMLDataGeneratorTool"
-			/>
-			<Tool
-				Name="VCWebServiceProxyGeneratorTool"
-			/>
-			<Tool
-				Name="VCMIDLTool"
-			/>
-			<Tool
-				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="$(SolutionDir)"
-				PreprocessorDefinitions="_NDEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT"
-				RuntimeLibrary="2"
-				UsePrecompiledHeader="2"
-				WarningLevel="3"
-				DebugInformationFormat="3"
-			/>
-			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCResourceCompilerTool"
-			/>
-			<Tool
-				Name="VCPreLinkEventTool"
-			/>
-			<Tool
-				Name="VCLinkerTool"
-				AdditionalDependencies="opengl32.lib glu32.lib libcef.lib libcef_dll_wrapper.lib"
-				ShowProgress="1"
-				LinkIncremental="1"
-				AdditionalLibraryDirectories="$(SolutionDir)libs\$(ConfigurationName)\"
-				GenerateDebugInformation="true"
-				TargetMachine="1"
-			/>
-			<Tool
-				Name="VCALinkTool"
-			/>
-			<Tool
-				Name="VCManifestTool"
-			/>
-			<Tool
-				Name="VCXDCMakeTool"
-			/>
-			<Tool
-				Name="VCBscMakeTool"
-			/>
-			<Tool
-				Name="VCFxCopTool"
-			/>
-			<Tool
-				Name="VCAppVerifierTool"
-			/>
-			<Tool
-				Name="VCPostBuildEventTool"
-			/>
-		</Configuration>
-	</Configurations>
-	<References>
-		<AssemblyReference
-			RelativePath="System.dll"
-			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
-			MinFrameworkVersion="131072"
-		/>
-		<AssemblyReference
-			RelativePath="System.Drawing.dll"
-			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
-			MinFrameworkVersion="131072"
-		/>
-	</References>
-	<Files>
-		<Filter
-			Name="Source Files"
-			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
-			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
-			>
-			<File
-				RelativePath=".\AssemblyInfo.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\BindingHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\BrowserCore.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\BrowserSettings.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ClientAdapter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\CookieVisitor.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\RenderClientAdapter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Request.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\RequestResponse.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\RtzCountdownEvent.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\SchemeHandler.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\ScriptCore.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Stdafx.cpp"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						UsePrecompiledHeader="1"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath=".\StreamAdapter.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\StringUtil.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\TypeUtil.cpp"
-				>
-			</File>
-		</Filter>
-		<Filter
-			Name="Header Files"
-			Filter="h;hpp;hxx;hm;inl;inc;xsd"
-			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
-			>
-			<File
-				RelativePath=".\BindingHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\BrowserCore.h"
-				>
-			</File>
-			<File
-				RelativePath=".\CefSharp.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ClientAdapter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ConsoleMessageEventArgs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\CookieVisitor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ICookieVisitor.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IKeyboardHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ILifeSpanHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ILoadHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IMenuHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IRenderWebBrowser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IRequestHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\IWebBrowser.h"
-				>
-			</File>
-			<File
-				RelativePath=".\LoadCompletedEventArgs.h"
-				>
-			</File>
-			<File
-				RelativePath=".\MCefRefPtr.h"
-				>
-			</File>
-			<File
-				RelativePath=".\RenderClientAdapter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Request.h"
-				>
-			</File>
-			<File
-				RelativePath=".\RequestResponse.h"
-				>
-			</File>
-			<File
-				RelativePath=".\RtzCountdownEvent.h"
-				>
-			</File>
-			<File
-				RelativePath=".\SchemeHandler.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ScriptCore.h"
-				>
-			</File>
-			<File
-				RelativePath=".\ScriptException.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Settings.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Stdafx.h"
-				>
-			</File>
-			<File
-				RelativePath=".\StreamAdapter.h"
-				>
-			</File>
-			<File
-				RelativePath=".\StringUtil.h"
-				>
-			</File>
-			<File
-				RelativePath=".\TypeUtil.h"
-				>
-			</File>
-		</Filter>
-	</Files>
-	<Globals>
-	</Globals>
-</VisualStudioProject>
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="CefSharp"
+	ProjectGUID="{7B495581-2271-4F41-9476-ACB86E8C864F}"
+	RootNamespace="CefSharp"
+	Keyword="ManagedCProj"
+	TargetFrameworkVersion="131072"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+		<Configuration
+			Name="Debug|Win32"
+			OutputDirectory="bin\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				Optimization="0"
+				AdditionalIncludeDirectories="$(SolutionDir)"
+				PreprocessorDefinitions="_DEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT"
+				RuntimeLibrary="3"
+				UsePrecompiledHeader="2"
+				GenerateXMLDocumentationFiles="true"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				IgnoreImportLibrary="false"
+				LinkLibraryDependencies="false"
+				AdditionalDependencies="opengl32.lib glu32.lib libcef.lib libcef_dll_wrapper.lib"
+				ShowProgress="1"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(SolutionDir)libs\$(ConfigurationName)\"
+				IgnoreAllDefaultLibraries="false"
+				IgnoreDefaultLibraryNames=""
+				GenerateDebugInformation="true"
+				AssemblyDebug="1"
+				TargetMachine="1"
+				KeyFile="$(SolutionDir)\CefSharp.snk"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+		<Configuration
+			Name="Release|Win32"
+			OutputDirectory="bin\$(ConfigurationName)"
+			IntermediateDirectory="obj\$(ConfigurationName)"
+			ConfigurationType="2"
+			CharacterSet="1"
+			ManagedExtensions="1"
+			WholeProgramOptimization="1"
+			>
+			<Tool
+				Name="VCPreBuildEventTool"
+			/>
+			<Tool
+				Name="VCCustomBuildTool"
+			/>
+			<Tool
+				Name="VCXMLDataGeneratorTool"
+			/>
+			<Tool
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
+			<Tool
+				Name="VCMIDLTool"
+			/>
+			<Tool
+				Name="VCCLCompilerTool"
+				AdditionalIncludeDirectories="$(SolutionDir)"
+				PreprocessorDefinitions="_NDEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT"
+				RuntimeLibrary="2"
+				UsePrecompiledHeader="2"
+				WarningLevel="3"
+				DebugInformationFormat="3"
+			/>
+			<Tool
+				Name="VCManagedResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCResourceCompilerTool"
+			/>
+			<Tool
+				Name="VCPreLinkEventTool"
+			/>
+			<Tool
+				Name="VCLinkerTool"
+				AdditionalDependencies="opengl32.lib glu32.lib libcef.lib libcef_dll_wrapper.lib"
+				ShowProgress="1"
+				LinkIncremental="1"
+				AdditionalLibraryDirectories="$(SolutionDir)libs\$(ConfigurationName)\"
+				GenerateDebugInformation="true"
+				TargetMachine="1"
+			/>
+			<Tool
+				Name="VCALinkTool"
+			/>
+			<Tool
+				Name="VCManifestTool"
+			/>
+			<Tool
+				Name="VCXDCMakeTool"
+			/>
+			<Tool
+				Name="VCBscMakeTool"
+			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
+			<Tool
+				Name="VCAppVerifierTool"
+			/>
+			<Tool
+				Name="VCPostBuildEventTool"
+			/>
+		</Configuration>
+	</Configurations>
+	<References>
+		<AssemblyReference
+			RelativePath="System.dll"
+			AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+		<AssemblyReference
+			RelativePath="System.Drawing.dll"
+			AssemblyName="System.Drawing, Version=2.0.0.0, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL"
+			MinFrameworkVersion="131072"
+		/>
+	</References>
+	<Files>
+		<Filter
+			Name="Source Files"
+			Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
+			UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
+			>
+			<File
+				RelativePath=".\AssemblyInfo.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\BindingHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\BrowserCore.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\BrowserSettings.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ClientAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\CookieVisitor.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\RenderClientAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Request.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\RequestResponse.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\RtzCountdownEvent.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\SchemeHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\ScriptCore.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Stdafx.cpp"
+				>
+				<FileConfiguration
+					Name="Debug|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+				<FileConfiguration
+					Name="Release|Win32"
+					>
+					<Tool
+						Name="VCCLCompilerTool"
+						UsePrecompiledHeader="1"
+					/>
+				</FileConfiguration>
+			</File>
+			<File
+				RelativePath=".\StreamAdapter.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\StringUtil.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\TypeUtil.cpp"
+				>
+			</File>
+		</Filter>
+		<Filter
+			Name="Header Files"
+			Filter="h;hpp;hxx;hm;inl;inc;xsd"
+			UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
+			>
+			<File
+				RelativePath=".\BindingHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\BrowserCore.h"
+				>
+			</File>
+			<File
+				RelativePath=".\CefSharp.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ClientAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ConsoleMessageEventArgs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\CookieVisitor.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ICookieVisitor.h"
+				>
+			</File>
+			<File
+				RelativePath=".\IKeyboardHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ILifeSpanHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ILoadHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\IMenuHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\IRenderWebBrowser.h"
+				>
+			</File>
+			<File
+				RelativePath=".\IRequestHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\IWebBrowser.h"
+				>
+			</File>
+			<File
+				RelativePath=".\LoadCompletedEventArgs.h"
+				>
+			</File>
+			<File
+				RelativePath=".\MCefRefPtr.h"
+				>
+			</File>
+			<File
+				RelativePath=".\RenderClientAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Request.h"
+				>
+			</File>
+			<File
+				RelativePath=".\RequestResponse.h"
+				>
+			</File>
+			<File
+				RelativePath=".\RtzCountdownEvent.h"
+				>
+			</File>
+			<File
+				RelativePath=".\SchemeHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ScriptCore.h"
+				>
+			</File>
+			<File
+				RelativePath=".\ScriptException.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Settings.h"
+				>
+			</File>
+			<File
+				RelativePath=".\Stdafx.h"
+				>
+			</File>
+			<File
+				RelativePath=".\StreamAdapter.h"
+				>
+			</File>
+			<File
+				RelativePath=".\StringUtil.h"
+				>
+			</File>
+			<File
+				RelativePath=".\TypeUtil.h"
+				>
+			</File>
+		</Filter>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>