1.1 --- a/VisualC/SDL/SDL_VS2005.vcproj	Sun Dec 12 15:19:05 2010 -0800
     1.2 +++ b/VisualC/SDL/SDL_VS2005.vcproj	Wed Dec 15 21:21:13 2010 -0500
     1.3 @@ -1,18 +1,10 @@
     1.4  <?xml version="1.0" encoding="Windows-1252"?>
     1.5  <VisualStudioProject
     1.6  	ProjectType="Visual C++"
     1.7 -<<<<<<< local
     1.8  	Version="8.00"
     1.9 -=======
    1.10 -	Version="9.00"
    1.11 ->>>>>>> other
    1.12  	Name="SDL"
    1.13  	ProjectGUID="{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
    1.14  	RootNamespace="SDL"
    1.15 -<<<<<<< local
    1.16 -=======
    1.17 -	TargetFrameworkVersion="131072"
    1.18 ->>>>>>> other
    1.19  	>
    1.20  	<Platforms>
    1.21  		<Platform
    1.22 @@ -84,36 +76,16 @@
    1.23  			/>
    1.24  			<Tool
    1.25  				Name="VCLinkerTool"
    1.26 -<<<<<<< local
    1.27  				AdditionalOptions="/MACHINE:I386"
    1.28 -=======
    1.29 -				AdditionalOptions="/MACHINE:I386&#x0D;&#x0A;msvcrt.lib"
    1.30 ->>>>>>> other
    1.31  				AdditionalDependencies="msimg32.lib winmm.lib"
    1.32  				OutputFile=".\Debug/SDL.dll"
    1.33  				LinkIncremental="2"
    1.34  				SuppressStartupBanner="true"
    1.35 -<<<<<<< local
    1.36  				IgnoreAllDefaultLibraries="true"
    1.37 -=======
    1.38 -				IgnoreAllDefaultLibraries="false"
    1.39 -				IgnoreDefaultLibraryNames=""
    1.40 ->>>>>>> other
    1.41  				GenerateDebugInformation="true"
    1.42  				ProgramDatabaseFile=".\Debug/SDL.pdb"
    1.43 -<<<<<<< local
    1.44  				SubSystem="2"
    1.45 -=======
    1.46 -				SubSystem="0"
    1.47 -				RandomizedBaseAddress="1"
    1.48 -				DataExecutionPrevention="0"
    1.49 ->>>>>>> other
    1.50  				ImportLibrary=".\Debug/SDL.lib"
    1.51 -<<<<<<< local
    1.52 -=======
    1.53 -				Profile="true"
    1.54 -				CLRThreadAttribute="0"
    1.55 ->>>>>>> other
    1.56  				CLRUnmanagedCodeCheck="false"
    1.57  			/>
    1.58  			<Tool
    1.59 @@ -135,12 +107,9 @@
    1.60  				Name="VCAppVerifierTool"
    1.61  			/>
    1.62  			<Tool
    1.63 -<<<<<<< local
    1.64  				Name="VCWebDeploymentTool"
    1.65  			/>
    1.66  			<Tool
    1.67 -=======
    1.68 ->>>>>>> other
    1.69  				Name="VCPostBuildEventTool"
    1.70  			/>
    1.71  		</Configuration>
    1.72 @@ -216,11 +185,6 @@
    1.73  				IgnoreAllDefaultLibraries="true"
    1.74  				ProgramDatabaseFile=".\Release/SDL.pdb"
    1.75  				SubSystem="2"
    1.76 -<<<<<<< local
    1.77 -=======
    1.78 -				RandomizedBaseAddress="1"
    1.79 -				DataExecutionPrevention="0"
    1.80 ->>>>>>> other
    1.81  				ImportLibrary=".\Release/SDL.lib"
    1.82  			/>
    1.83  			<Tool
    1.84 @@ -242,12 +206,9 @@
    1.85  				Name="VCAppVerifierTool"
    1.86  			/>
    1.87  			<Tool
    1.88 -<<<<<<< local
    1.89  				Name="VCWebDeploymentTool"
    1.90  			/>
    1.91  			<Tool
    1.92 -=======
    1.93 ->>>>>>> other
    1.94  				Name="VCPostBuildEventTool"
    1.95  			/>
    1.96  		</Configuration>
    1.97 @@ -980,17 +941,6 @@
    1.98  			>
    1.99  		</File>
   1.100  		<File
   1.101 -<<<<<<< local
   1.102 -=======
   1.103 -			RelativePath="..\..\src\events\SDL_touch.c"
   1.104 -			>
   1.105 -		</File>
   1.106 -		<File
   1.107 -			RelativePath="..\..\src\events\SDL_touch_c.h"
   1.108 -			>
   1.109 -		</File>
   1.110 -		<File
   1.111 ->>>>>>> other
   1.112  			RelativePath="..\..\src\video\SDL_video.c"
   1.113  			>
   1.114  		</File>