openttd-ottdgrfs: projects/openttd.vcproj@59048224be55 (annotated)

5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1	<?xml version="1.0" encoding="Windows-1252"?>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	2	<VisualStudioProject
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	3	ProjectType="Visual C++"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	4	Version="7.10"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	5	Name="openttd"
6423 fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	6	RootNamespace="openttd"
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	7	SccProjectName=""
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	8	SccLocalPath="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	9	<Platforms>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	10	<Platform
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	11	Name="Win32"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	12	</Platforms>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	13	<Configurations>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	14	<Configuration
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	15	Name="Release\|Win32"
6599 b08cb9c93e8b (svn r9082) -Codechange: [win32] Update VS2003 and VS2005 project files to use the same outpath, and build in UNICODE mode. When making a release it is probably better to make two binaries, one without UNICODE, the other with, guaranteeing full Win9x compatibility (UNICODE with MSLU also works, without it's even better). Darkvater parents: 6590 diff changeset	16	OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
b08cb9c93e8b (svn r9082) -Codechange: [win32] Update VS2003 and VS2005 project files to use the same outpath, and build in UNICODE mode. When making a release it is probably better to make two binaries, one without UNICODE, the other with, guaranteeing full Win9x compatibility (UNICODE with MSLU also works, without it's even better). Darkvater parents: 6590 diff changeset	17	IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)"
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	18	ConfigurationType="1"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	19	UseOfMFC="0"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	20	ATLMinimizesCRunTimeLibraryUsage="FALSE"
6599 b08cb9c93e8b (svn r9082) -Codechange: [win32] Update VS2003 and VS2005 project files to use the same outpath, and build in UNICODE mode. When making a release it is probably better to make two binaries, one without UNICODE, the other with, guaranteeing full Win9x compatibility (UNICODE with MSLU also works, without it's even better). Darkvater parents: 6590 diff changeset	21	CharacterSet="1"
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	22	WholeProgramOptimization="TRUE">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	23	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	24	Name="VCCLCompilerTool"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	25	Optimization="3"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	26	GlobalOptimizations="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	27	InlineFunctionExpansion="2"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	28	EnableIntrinsicFunctions="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	29	FavorSizeOrSpeed="2"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	30	OmitFramePointers="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	31	OptimizeForProcessor="1"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	32	AdditionalIncludeDirectories="..\objs\langs"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	33	PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	34	StringPooling="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	35	ExceptionHandling="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	36	RuntimeLibrary="0"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	37	StructMemberAlignment="3"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	38	BufferSecurityCheck="FALSE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	39	EnableFunctionLevelLinking="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	40	DefaultCharIsUnsigned="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	41	UsePrecompiledHeader="0"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	42	PrecompiledHeaderThrough=""
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	43	PrecompiledHeaderFile=""
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	44	AssemblerOutput="2"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	45	AssemblerListingLocation="$(IntDir)/"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	46	ObjectFile="$(IntDir)/"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	47	ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	48	BrowseInformation="1"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	49	BrowseInformationFile="$(IntDir)/"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	50	WarningLevel="3"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	51	WarnAsError="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	52	SuppressStartupBanner="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	53	DebugInformationFormat="3"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	54	CallingConvention="1"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	55	CompileAs="0"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	56	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	57	Name="VCCustomBuildTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	58	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	59	Name="VCLinkerTool"
6599 b08cb9c93e8b (svn r9082) -Codechange: [win32] Update VS2003 and VS2005 project files to use the same outpath, and build in UNICODE mode. When making a release it is probably better to make two binaries, one without UNICODE, the other with, guaranteeing full Win9x compatibility (UNICODE with MSLU also works, without it's even better). Darkvater parents: 6590 diff changeset	60	AdditionalDependencies="winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	61	LinkIncremental="1"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	62	SuppressStartupBanner="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	63	IgnoreDefaultLibraryNames=""
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	64	GenerateDebugInformation="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	65	SubSystem="2"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	66	OptimizeReferences="2"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	67	OptimizeForWindows98="1"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	68	TargetMachine="1"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	69	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	70	Name="VCMIDLTool"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	71	TypeLibraryName=".\Release/openttd.tlb"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	72	HeaderFileName=""/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	73	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	74	Name="VCPostBuildEventTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	75	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	76	Name="VCPreBuildEventTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	77	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	78	Name="VCPreLinkEventTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	79	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	80	Name="VCResourceCompilerTool"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	81	PreprocessorDefinitions="NDEBUG"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	82	Culture="1053"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	83	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	84	Name="VCWebServiceProxyGeneratorTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	85	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	86	Name="VCXMLDataGeneratorTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	87	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	88	Name="VCWebDeploymentTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	89	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	90	Name="VCManagedWrapperGeneratorTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	91	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	92	Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	93	</Configuration>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	94	<Configuration
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	95	Name="Debug\|Win32"
6599 b08cb9c93e8b (svn r9082) -Codechange: [win32] Update VS2003 and VS2005 project files to use the same outpath, and build in UNICODE mode. When making a release it is probably better to make two binaries, one without UNICODE, the other with, guaranteeing full Win9x compatibility (UNICODE with MSLU also works, without it's even better). Darkvater parents: 6590 diff changeset	96	OutputDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
b08cb9c93e8b (svn r9082) -Codechange: [win32] Update VS2003 and VS2005 project files to use the same outpath, and build in UNICODE mode. When making a release it is probably better to make two binaries, one without UNICODE, the other with, guaranteeing full Win9x compatibility (UNICODE with MSLU also works, without it's even better). Darkvater parents: 6590 diff changeset	97	IntermediateDirectory="..\objs\$(PlatformName)\$(ConfigurationName)\"
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	98	ConfigurationType="1"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	99	UseOfMFC="0"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	100	ATLMinimizesCRunTimeLibraryUsage="FALSE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	101	CharacterSet="1">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	102	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	103	Name="VCCLCompilerTool"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	104	Optimization="0"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	105	AdditionalIncludeDirectories="..\objs\langs"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	106	PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	107	BasicRuntimeChecks="3"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	108	RuntimeLibrary="1"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	109	UsePrecompiledHeader="0"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	110	AssemblerListingLocation="$(IntDir)/"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	111	ObjectFile="$(IntDir)/"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	112	ProgramDataBaseFileName="$(IntDir)/$(TargetName).pdb"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	113	WarningLevel="3"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	114	WarnAsError="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	115	SuppressStartupBanner="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	116	Detect64BitPortabilityProblems="FALSE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	117	DebugInformationFormat="4"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	118	CallingConvention="1"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	119	CompileAs="0"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	120	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	121	Name="VCCustomBuildTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	122	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	123	Name="VCLinkerTool"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	124	AdditionalDependencies="unicows.lib winmm.lib ws2_32.lib libpng.lib zlibstat.lib dxguid.lib libfreetype2.lib"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	125	LinkIncremental="0"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	126	SuppressStartupBanner="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	127	IgnoreDefaultLibraryNames="LIBCMT.lib"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	128	GenerateDebugInformation="TRUE"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	129	SubSystem="2"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	130	TargetMachine="1"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	131	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	132	Name="VCMIDLTool"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	133	TypeLibraryName=".\Debug/openttd.tlb"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	134	HeaderFileName=""/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	135	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	136	Name="VCPostBuildEventTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	137	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	138	Name="VCPreBuildEventTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	139	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	140	Name="VCPreLinkEventTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	141	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	142	Name="VCResourceCompilerTool"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	143	PreprocessorDefinitions="_DEBUG"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	144	Culture="1053"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	145	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	146	Name="VCWebServiceProxyGeneratorTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	147	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	148	Name="VCXMLDataGeneratorTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	149	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	150	Name="VCWebDeploymentTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	151	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	152	Name="VCManagedWrapperGeneratorTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	153	<Tool
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	154	Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	155	</Configuration>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	156	</Configurations>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	157	<References>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	158	</References>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	159	<Files>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	160	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	161	Name="Source Files"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	162	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	163	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	164	RelativePath=".\..\src\airport.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	165	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	166	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	167	RelativePath=".\..\src\aystar.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	168	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	169	<File
6590 9bbf8fdc5e91 (svn r9073) -Codechange: moved autoreplace to a file of it's own (now autoreplace has a cmd and a gui file) bjarni parents: 6516 diff changeset	170	RelativePath=".\..\src\autoreplace_cmd.cpp">
9bbf8fdc5e91 (svn r9073) -Codechange: moved autoreplace to a file of it's own (now autoreplace has a cmd and a gui file) bjarni parents: 6516 diff changeset	171	</File>
9bbf8fdc5e91 (svn r9073) -Codechange: moved autoreplace to a file of it's own (now autoreplace has a cmd and a gui file) bjarni parents: 6516 diff changeset	172	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	173	RelativePath=".\..\src\bmp.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	174	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	175	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	176	RelativePath=".\..\src\callback_table.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	177	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	178	<File
6417 26acff62d001 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: 6110 diff changeset	179	RelativePath=".\..\src\cargotype.cpp">
26acff62d001 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: 6110 diff changeset	180	</File>
26acff62d001 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: 6110 diff changeset	181	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	182	RelativePath=".\..\src\command.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	183	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	184	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	185	RelativePath=".\..\src\console.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	186	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	187	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	188	RelativePath=".\..\src\console_cmds.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	189	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	190	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	191	RelativePath=".\..\src\currency.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	192	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	193	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	194	RelativePath=".\..\src\date.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	195	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	196	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	197	RelativePath=".\..\src\debug.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	198	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	199	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	200	RelativePath=".\..\src\dedicated.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	201	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	202	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	203	RelativePath=".\..\src\depot.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	204	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	205	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	206	RelativePath=".\..\src\driver.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	207	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	208	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	209	RelativePath=".\..\src\economy.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	210	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	211	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	212	RelativePath=".\..\src\elrail.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	213	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	214	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	215	RelativePath=".\..\src\engine.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	216	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	217	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	218	RelativePath=".\..\src\fileio.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	219	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	220	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	221	RelativePath=".\..\src\fios.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	222	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	223	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	224	RelativePath=".\..\src\fontcache.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	225	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	226	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	227	RelativePath=".\..\src\genworld.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	228	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	229	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	230	RelativePath=".\..\src\gfx.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	231	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	232	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	233	RelativePath=".\..\src\gfxinit.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	234	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	235	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	236	RelativePath=".\..\src\heightmap.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	237	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	238	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	239	RelativePath=".\..\src\helpers.cpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	240	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	241	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	242	RelativePath=".\..\src\landscape.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	243	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	244	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	245	RelativePath=".\..\src\map.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	246	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	247	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	248	RelativePath=".\..\src\md5.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	249	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	250	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	251	RelativePath=".\..\src\mersenne.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	252	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	253	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	254	RelativePath=".\..\src\minilzo.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	255	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	256	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	257	RelativePath=".\..\src\misc.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	258	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	259	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	260	RelativePath=".\..\src\mixer.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	261	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	262	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	263	RelativePath=".\..\src\music.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	264	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	265	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	266	RelativePath=".\..\src\namegen.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	267	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	268	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	269	RelativePath=".\..\src\network\network.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	270	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	271	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	272	RelativePath=".\..\src\network\network_client.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	273	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	274	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	275	RelativePath=".\..\src\network\network_data.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	276	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	277	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	278	RelativePath=".\..\src\network\network_gamelist.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	279	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	280	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	281	RelativePath=".\..\src\network\network_server.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	282	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	283	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	284	RelativePath=".\..\src\network\network_udp.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	285	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	286	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	287	RelativePath=".\..\src\npf.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	288	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	289	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	290	RelativePath=".\..\src\oldloader.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	291	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	292	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	293	RelativePath=".\..\src\oldpool.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	294	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	295	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	296	RelativePath=".\..\src\openttd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	297	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	298	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	299	RelativePath=".\..\src\os_timer.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	300	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	301	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	302	RelativePath=".\..\src\ottdres.rc">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	303	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	304	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	305	RelativePath=".\..\src\pathfind.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	306	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	307	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	308	RelativePath=".\..\src\players.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	309	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	310	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	311	RelativePath=".\..\src\queue.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	312	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	313	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	314	RelativePath=".\..\src\rail.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	315	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	316	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	317	RelativePath=".\..\src\saveload.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	318	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	319	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	320	RelativePath=".\..\src\screenshot.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	321	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	322	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	323	RelativePath=".\..\src\sdl.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	324	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	325	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	326	RelativePath=".\..\src\settings.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	327	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	328	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	329	RelativePath=".\..\src\signs.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	330	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	331	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	332	RelativePath=".\..\src\sound.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	333	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	334	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	335	RelativePath=".\..\src\spritecache.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	336	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	337	<File
5916 75c6d5cf1600 (svn r8125) -Codechange: Station is now constructed/destroyed using new/delete operators (don't worry, they still use the same memory pool). Few station related functions turned into Station::methods (just first step). All this new stuff moved from station_cmd.cpp to the new file (station.cpp). KUDr parents: 5896 diff changeset	338	RelativePath=".\..\src\station.cpp">
75c6d5cf1600 (svn r8125) -Codechange: Station is now constructed/destroyed using new/delete operators (don't worry, they still use the same memory pool). Few station related functions turned into Station::methods (just first step). All this new stuff moved from station_cmd.cpp to the new file (station.cpp). KUDr parents: 5896 diff changeset	339	</File>
75c6d5cf1600 (svn r8125) -Codechange: Station is now constructed/destroyed using new/delete operators (don't worry, they still use the same memory pool). Few station related functions turned into Station::methods (just first step). All this new stuff moved from station_cmd.cpp to the new file (station.cpp). KUDr parents: 5896 diff changeset	340	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	341	RelativePath=".\..\src\string.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	342	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	343	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	344	RelativePath=".\..\src\strings.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	345	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	346	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	347	RelativePath=".\..\src\texteff.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	348	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	349	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	350	RelativePath=".\..\src\tgp.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	351	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	352	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	353	RelativePath=".\..\src\thread.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	354	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	355	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	356	RelativePath=".\..\src\tile.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	357	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	358	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	359	RelativePath=".\..\src\vehicle.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	360	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	361	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	362	RelativePath=".\..\src\viewport.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	363	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	364	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	365	RelativePath=".\..\src\waypoint.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	366	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	367	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	368	RelativePath=".\..\src\widget.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	369	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	370	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	371	RelativePath=".\..\src\win32.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	372	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	373	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	374	RelativePath=".\..\src\window.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	375	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	376	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	377	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	378	Name="Header Files"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	379	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	380	<File
6110 c020b2be57ac (svn r8435) -Regression (r7759?): Readd aircraft.h to the project files which were added in r6644 but miracuously disappeared sometime afterwards Darkvater parents: 6095 diff changeset	381	RelativePath=".\..\src\aircraft.h">
c020b2be57ac (svn r8435) -Regression (r7759?): Readd aircraft.h to the project files which were added in r6644 but miracuously disappeared sometime afterwards Darkvater parents: 6095 diff changeset	382	</File>
c020b2be57ac (svn r8435) -Regression (r7759?): Readd aircraft.h to the project files which were added in r6644 but miracuously disappeared sometime afterwards Darkvater parents: 6095 diff changeset	383	<File
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	384	RelativePath=".\..\src\airport.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	385	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	386	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	387	RelativePath=".\..\src\airport_movement.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	388	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	389	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	390	RelativePath=".\..\src\aystar.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	391	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	392	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	393	RelativePath=".\..\src\bmp.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	394	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	395	<File
6417 26acff62d001 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: 6110 diff changeset	396	RelativePath=".\..\src\cargotype.h">
26acff62d001 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: 6110 diff changeset	397	</File>
26acff62d001 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: 6110 diff changeset	398	<File
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	399	RelativePath=".\..\src\command.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	400	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	401	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	402	RelativePath=".\..\src\console.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	403	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	404	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	405	RelativePath=".\..\src\currency.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	406	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	407	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	408	RelativePath=".\..\src\date.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	409	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	410	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	411	RelativePath=".\..\src\debug.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	412	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	413	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	414	RelativePath=".\..\src\video\dedicated_v.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	415	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	416	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	417	RelativePath=".\..\src\depot.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	418	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	419	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	420	RelativePath=".\..\src\music\dmusic.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	421	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	422	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	423	RelativePath=".\..\src\driver.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	424	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	425	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	426	RelativePath=".\..\src\economy.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	427	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	428	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	429	RelativePath=".\..\src\engine.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	430	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	431	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	432	RelativePath=".\..\src\fileio.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	433	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	434	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	435	RelativePath=".\..\src\fios.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	436	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	437	<File
6423 fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	438	RelativePath=".\..\src\fontcache.h">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	439	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	440	<File
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	441	RelativePath=".\..\src\functions.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	442	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	443	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	444	RelativePath=".\..\src\genworld.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	445	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	446	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	447	RelativePath=".\..\src\gfx.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	448	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	449	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	450	RelativePath=".\..\src\gfxinit.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	451	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	452	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	453	RelativePath=".\..\src\gui.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	454	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	455	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	456	RelativePath=".\..\src\hal.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	457	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	458	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	459	RelativePath=".\..\src\heightmap.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	460	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	461	<File
5896 b1f465cc40db (svn r8104) -Fix: missing helpers.hpp added into source.list and VC KUDr parents: 5891 diff changeset	462	RelativePath=".\..\src\helpers.hpp">
b1f465cc40db (svn r8104) -Fix: missing helpers.hpp added into source.list and VC KUDr parents: 5891 diff changeset	463	</File>
b1f465cc40db (svn r8104) -Fix: missing helpers.hpp added into source.list and VC KUDr parents: 5891 diff changeset	464	<File
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	465	RelativePath=".\..\src\industry.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	466	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	467	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	468	RelativePath=".\..\src\livery.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	469	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	470	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	471	RelativePath=".\..\src\macros.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	472	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	473	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	474	RelativePath=".\..\src\map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	475	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	476	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	477	RelativePath=".\..\src\md5.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	478	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	479	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	480	RelativePath=".\..\src\mixer.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	481	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	482	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	483	RelativePath=".\..\src\music.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	484	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	485	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	486	RelativePath=".\..\src\network\network.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	487	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	488	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	489	RelativePath=".\..\src\network\network_client.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	490	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	491	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	492	RelativePath=".\..\src\network\network_data.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	493	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	494	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	495	RelativePath=".\..\src\network\network_gamelist.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	496	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	497	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	498	RelativePath=".\..\src\network\network_gui.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	499	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	500	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	501	RelativePath=".\..\src\network\network_server.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	502	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	503	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	504	RelativePath=".\..\src\network\network_udp.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	505	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	506	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	507	RelativePath=".\..\src\newgrf.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	508	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	509	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	510	RelativePath=".\..\src\newgrf_callbacks.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	511	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	512	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	513	RelativePath=".\..\src\newgrf_cargo.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	514	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	515	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	516	RelativePath=".\..\src\newgrf_config.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	517	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	518	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	519	RelativePath=".\..\src\newgrf_engine.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	520	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	521	<File
6658 59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	522	RelativePath=".\..\src\newgrf_house.h">
59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	523	</File>
59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	524	<File
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	525	RelativePath=".\..\src\newgrf_sound.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	526	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	527	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	528	RelativePath=".\..\src\newgrf_spritegroup.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	529	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	530	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	531	RelativePath=".\..\src\newgrf_station.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	532	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	533	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	534	RelativePath=".\..\src\newgrf_text.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	535	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	536	<File
6658 59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	537	RelativePath=".\..\src\newgrf_town.h">
59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	538	</File>
59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	539	<File
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	540	RelativePath=".\..\src\news.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	541	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	542	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	543	RelativePath=".\..\src\npf.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	544	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	545	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	546	RelativePath=".\..\src\music\null_m.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	547	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	548	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	549	RelativePath=".\..\src\sound\null_s.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	550	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	551	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	552	RelativePath=".\..\src\video\null_v.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	553	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	554	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	555	RelativePath=".\..\src\oldpool.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	556	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	557	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	558	RelativePath=".\..\src\openttd.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	559	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	560	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	561	RelativePath=".\..\src\pathfind.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	562	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	563	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	564	RelativePath=".\..\src\player.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	565	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	566	<File
6516 ee6d057b9850 (svn r8969) -Codechange: rework of the player face bits. rubidium parents: 6439 diff changeset	567	RelativePath=".\..\src\player_face.h">
ee6d057b9850 (svn r8969) -Codechange: rework of the player face bits. rubidium parents: 6439 diff changeset	568	</File>
ee6d057b9850 (svn r8969) -Codechange: rework of the player face bits. rubidium parents: 6439 diff changeset	569	<File
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	570	RelativePath=".\..\src\queue.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	571	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	572	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	573	RelativePath=".\..\src\rail.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	574	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	575	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	576	RelativePath=".\..\src\road_cmd.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	577	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	578	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	579	RelativePath=".\..\src\saveload.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	580	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	581	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	582	RelativePath=".\..\src\screenshot.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	583	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	584	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	585	RelativePath=".\..\src\sound\sdl_s.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	586	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	587	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	588	RelativePath=".\..\src\video\sdl_v.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	589	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	590	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	591	RelativePath=".\..\src\settings.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	592	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	593	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	594	RelativePath=".\..\src\signs.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	595	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	596	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	597	RelativePath=".\..\src\slope.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	598	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	599	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	600	RelativePath=".\..\src\sound.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	601	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	602	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	603	RelativePath=".\..\src\sprite.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	604	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	605	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	606	RelativePath=".\..\src\station.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	607	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	608	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	609	RelativePath=".\..\src\stdafx.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	610	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	611	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	612	RelativePath=".\..\src\string.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	613	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	614	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	615	RelativePath=".\..\src\tgp.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	616	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	617	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	618	RelativePath=".\..\src\thread.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	619	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	620	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	621	RelativePath=".\..\src\tile.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	622	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	623	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	624	RelativePath=".\..\src\town.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	625	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	626	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	627	RelativePath=".\..\src\train.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	628	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	629	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	630	RelativePath=".\..\src\variables.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	631	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	632	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	633	RelativePath=".\..\src\vehicle.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	634	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	635	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	636	RelativePath=".\..\src\vehicle_gui.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	637	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	638	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	639	RelativePath=".\..\src\viewport.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	640	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	641	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	642	RelativePath=".\..\src\waypoint.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	643	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	644	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	645	RelativePath=".\..\src\music\win32_m.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	646	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	647	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	648	RelativePath=".\..\src\sound\win32_s.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	649	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	650	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	651	RelativePath=".\..\src\video\win32_v.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	652	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	653	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	654	RelativePath=".\..\src\window.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	655	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	656	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	657	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	658	Name="GUI Source Code"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	659	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	660	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	661	RelativePath=".\..\src\aircraft_gui.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	662	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	663	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	664	RelativePath=".\..\src\airport_gui.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	665	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	666	<File
6060 8388a1bcb7c8 (svn r8371) -Codechange: [autoreplace GUI] moved the autoreplace GUI to a file of it's own bjarni parents: 6059 diff changeset	667	RelativePath=".\..\src\autoreplace_gui.cpp">
8388a1bcb7c8 (svn r8371) -Codechange: [autoreplace GUI] moved the autoreplace GUI to a file of it's own bjarni parents: 6059 diff changeset	668	</File>
8388a1bcb7c8 (svn r8371) -Codechange: [autoreplace GUI] moved the autoreplace GUI to a file of it's own bjarni parents: 6059 diff changeset	669	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	670	RelativePath=".\..\src\bridge_gui.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	671	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	672	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	673	RelativePath=".\..\src\build_vehicle_gui.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	674	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	675	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	676	RelativePath=".\..\src\depot_gui.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	677	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	678	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	679	RelativePath=".\..\src\dock_gui.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	680	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	681	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	682	RelativePath=".\..\src\engine_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	683	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	684	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	685	RelativePath=".\..\src\genworld_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	686	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	687	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	688	RelativePath=".\..\src\graph_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	689	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	690	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	691	RelativePath=".\..\src\industry_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	692	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	693	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	694	RelativePath=".\..\src\intro_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	695	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	696	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	697	RelativePath=".\..\src\main_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	698	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	699	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	700	RelativePath=".\..\src\misc_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	701	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	702	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	703	RelativePath=".\..\src\music_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	704	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	705	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	706	RelativePath=".\..\src\network\network_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	707	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	708	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	709	RelativePath=".\..\src\newgrf_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	710	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	711	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	712	RelativePath=".\..\src\news_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	713	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	714	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	715	RelativePath=".\..\src\order_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	716	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	717	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	718	RelativePath=".\..\src\player_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	719	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	720	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	721	RelativePath=".\..\src\rail_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	722	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	723	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	724	RelativePath=".\..\src\road_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	725	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	726	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	727	RelativePath=".\..\src\roadveh_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	728	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	729	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	730	RelativePath=".\..\src\settings_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	731	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	732	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	733	RelativePath=".\..\src\ship_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	734	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	735	<File
6002 0cc302eda282 (svn r8301) -Codechange: Move the code relating to the sign list window from graph_gui.cpp to a file of its own: signs_gui.cpp. maedhros parents: 5916 diff changeset	736	RelativePath=".\..\src\signs_gui.cpp">
0cc302eda282 (svn r8301) -Codechange: Move the code relating to the sign list window from graph_gui.cpp to a file of its own: signs_gui.cpp. maedhros parents: 5916 diff changeset	737	</File>
0cc302eda282 (svn r8301) -Codechange: Move the code relating to the sign list window from graph_gui.cpp to a file of its own: signs_gui.cpp. maedhros parents: 5916 diff changeset	738	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	739	RelativePath=".\..\src\smallmap_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	740	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	741	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	742	RelativePath=".\..\src\station_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	743	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	744	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	745	RelativePath=".\..\src\subsidy_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	746	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	747	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	748	RelativePath=".\..\src\terraform_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	749	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	750	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	751	RelativePath=".\..\src\town_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	752	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	753	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	754	RelativePath=".\..\src\train_gui.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	755	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	756	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	757	RelativePath=".\..\src\vehicle_gui.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	758	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	759	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	760	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	761	Name="Landscape"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	762	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	763	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	764	RelativePath=".\..\src\aircraft_cmd.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	765	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	766	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	767	RelativePath=".\..\src\clear_cmd.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	768	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	769	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	770	RelativePath=".\..\src\disaster_cmd.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	771	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	772	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	773	RelativePath=".\..\src\dummy_land.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	774	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	775	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	776	RelativePath=".\..\src\industry_cmd.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	777	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	778	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	779	RelativePath=".\..\src\misc_cmd.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	780	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	781	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	782	RelativePath=".\..\src\order_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	783	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	784	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	785	RelativePath=".\..\src\rail_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	786	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	787	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	788	RelativePath=".\..\src\road_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	789	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	790	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	791	RelativePath=".\..\src\roadveh_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	792	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	793	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	794	RelativePath=".\..\src\ship_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	795	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	796	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	797	RelativePath=".\..\src\station_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	798	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	799	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	800	RelativePath=".\..\src\town_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	801	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	802	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	803	RelativePath=".\..\src\train_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	804	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	805	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	806	RelativePath=".\..\src\tree_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	807	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	808	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	809	RelativePath=".\..\src\tunnelbridge_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	810	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	811	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	812	RelativePath=".\..\src\unmovable_cmd.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	813	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	814	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	815	RelativePath=".\..\src\water_cmd.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	816	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	817	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	818	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	819	Name="Tables"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	820	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	821	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	822	RelativePath=".\..\src\table\ai_rail.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	823	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	824	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	825	RelativePath=".\..\src\table\allstrings.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	826	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	827	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	828	RelativePath=".\..\src\table\animcursors.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	829	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	830	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	831	RelativePath=".\..\src\table\autorail.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	832	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	833	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	834	RelativePath=".\..\src\table\build_industry.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	835	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	836	<File
6417 26acff62d001 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: 6110 diff changeset	837	RelativePath=".\..\src\table\cargo_const.h">
26acff62d001 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: 6110 diff changeset	838	</File>
26acff62d001 (svn r8826) -Codechange: Replace _cargoc's separate arrays with a regular struct array (with accessor) and implement new initialization method using cargo labels. peter1138 parents: 6110 diff changeset	839	<File
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	840	RelativePath=".\..\src\table\clear_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	841	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	842	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	843	RelativePath=".\..\src\table\elrail_data.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	844	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	845	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	846	RelativePath=".\..\src\table\engines.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	847	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	848	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	849	RelativePath=".\..\src\table\genland.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	850	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	851	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	852	RelativePath=".\..\src\table\industry_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	853	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	854	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	855	RelativePath=".\..\src\table\landscape_sprite.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	856	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	857	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	858	RelativePath=".\..\src\table\namegen.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	859	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	860	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	861	RelativePath=".\..\src\table\palettes.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	862	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	863	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	864	RelativePath=".\..\src\table\road_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	865	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	866	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	867	RelativePath=".\..\src\table\roadveh.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	868	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	869	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	870	RelativePath=".\..\src\table\sprites.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	871	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	872	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	873	RelativePath=".\..\src\table\station_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	874	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	875	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	876	RelativePath=".\..\src\table\strings.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	877	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	878	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	879	RelativePath=".\..\src\table\town_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	880	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	881	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	882	RelativePath=".\..\src\table\track_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	883	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	884	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	885	RelativePath=".\..\src\table\train_cmd.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	886	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	887	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	888	RelativePath=".\..\src\table\tree_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	889	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	890	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	891	RelativePath=".\..\src\table\tunnel_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	892	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	893	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	894	RelativePath=".\..\src\table\unmovable_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	895	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	896	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	897	RelativePath=".\..\src\table\water_land.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	898	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	899	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	900	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	901	Name="AI Files"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	902	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	903	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	904	RelativePath=".\..\src\ai\ai.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	905	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	906	<File
6423 fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	907	RelativePath=".\..\src\ai\trolly\build.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	908	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	909	<File
6423 fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	910	RelativePath=".\..\src\ai\default\default.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	911	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	912	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	913	RelativePath=".\..\src\ai\trolly\pathfinder.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	914	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	915	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	916	RelativePath=".\..\src\ai\trolly\shared.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	917	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	918	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	919	RelativePath=".\..\src\ai\trolly\trolly.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	920	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	921	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	922	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	923	Name="NewGRF"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	924	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	925	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	926	RelativePath=".\..\src\newgrf.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	927	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	928	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	929	RelativePath=".\..\src\newgrf_config.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	930	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	931	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	932	RelativePath=".\..\src\newgrf_engine.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	933	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	934	<File
6658 59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	935	RelativePath=".\..\src\newgrf_house.cpp">
59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	936	</File>
59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	937	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	938	RelativePath=".\..\src\newgrf_sound.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	939	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	940	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	941	RelativePath=".\..\src\newgrf_spritegroup.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	942	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	943	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	944	RelativePath=".\..\src\newgrf_station.cpp">
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	945	</File>
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	946	<File
9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	947	RelativePath=".\..\src\newgrf_text.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	948	</File>
6658 59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	949	<File
59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	950	RelativePath=".\..\src\newgrf_town.cpp">
59048224be55 (svn r9315) -Merge: The newhouses branch. With this merge comes almost complete support for maedhros parents: 6599 diff changeset	951	</File>
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	952	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	953	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	954	Name="Map Accessors"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	955	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	956	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	957	RelativePath=".\..\src\bridge_map.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	958	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	959	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	960	RelativePath=".\..\src\bridge_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	961	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	962	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	963	RelativePath=".\..\src\clear_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	964	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	965	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	966	RelativePath=".\..\src\industry_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	967	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	968	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	969	RelativePath=".\..\src\rail_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	970	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	971	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	972	RelativePath=".\..\src\road_map.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	973	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	974	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	975	RelativePath=".\..\src\road_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	976	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	977	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	978	RelativePath=".\..\src\station_map.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	979	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	980	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	981	RelativePath=".\..\src\station_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	982	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	983	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	984	RelativePath=".\..\src\town_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	985	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	986	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	987	RelativePath=".\..\src\tree_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	988	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	989	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	990	RelativePath=".\..\src\tunnel_map.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	991	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	992	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	993	RelativePath=".\..\src\tunnel_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	994	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	995	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	996	RelativePath=".\..\src\unmovable_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	997	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	998	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	999	RelativePath=".\..\src\void_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1000	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1001	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1002	RelativePath=".\..\src\water_map.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1003	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1004	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1005	<Filter
5891 3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1006	Name="Misc"
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1007	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1008	<File
5891 3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1009	RelativePath=".\..\src\misc\array.hpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1010	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1011	<File
5891 3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1012	RelativePath=".\..\src\misc\autocopyptr.hpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1013	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1014	<File
6095 55d5c0e6be3a (svn r8414) -Codechange: Use own AutoPtrT instead of std::auto_ptr. KUDr parents: 6060 diff changeset	1015	RelativePath=".\..\src\misc\autoptr.hpp">
55d5c0e6be3a (svn r8414) -Codechange: Use own AutoPtrT instead of std::auto_ptr. KUDr parents: 6060 diff changeset	1016	</File>
55d5c0e6be3a (svn r8414) -Codechange: Use own AutoPtrT instead of std::auto_ptr. KUDr parents: 6060 diff changeset	1017	<File
5891 3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1018	RelativePath=".\..\src\misc\binaryheap.hpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1019	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1020	<File
5891 3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1021	RelativePath=".\..\src\misc\blob.hpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1022	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1023	<File
5891 3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1024	RelativePath=".\..\src\misc\countedptr.hpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1025	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1026	<File
5891 3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1027	RelativePath=".\..\src\misc\crc32.hpp">
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1028	</File>
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1029	<File
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1030	RelativePath=".\..\src\misc\fixedsizearray.hpp">
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1031	</File>
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1032	<File
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1033	RelativePath=".\..\src\misc\hashtable.hpp">
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1034	</File>
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1035	</Filter>
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1036	<Filter
6423 fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1037	Name="Network Core"
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1038	Filter="">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1039	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1040	RelativePath=".\..\src\network\core\config.h">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1041	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1042	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1043	RelativePath=".\..\src\network\core\core.cpp">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1044	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1045	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1046	RelativePath=".\..\src\network\core\core.h">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1047	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1048	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1049	RelativePath=".\..\src\network\core\game.h">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1050	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1051	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1052	RelativePath=".\..\src\network\core\os_abstraction.h">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1053	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1054	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1055	RelativePath=".\..\src\network\core\packet.cpp">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1056	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1057	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1058	RelativePath=".\..\src\network\core\packet.h">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1059	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1060	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1061	RelativePath=".\..\src\network\core\tcp.cpp">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1062	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1063	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1064	RelativePath=".\..\src\network\core\tcp.h">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1065	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1066	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1067	RelativePath=".\..\src\network\core\udp.cpp">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1068	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1069	<File
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1070	RelativePath=".\..\src\network\core\udp.h">
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1071	</File>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1072	</Filter>
fba62307aab7 (svn r8832) -Change: rewrite the solution file generator a little so it makes project files that look more like the ones generated by respectively MSVC2003 and MSVC2005. rubidium parents: 6417 diff changeset	1073	<Filter
5891 3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1074	Name="YAPF"
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1075	Filter="">
3efd24f248d3 (svn r8099) -Fix (r8092): source.list updated to reflect move of header files (thanks stillunknown). vcproj files updated too (thanks glx) KUDr parents: 5838 diff changeset	1076	<File
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1077	RelativePath=".\..\src\yapf\follow_track.cpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1078	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1079	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1080	RelativePath=".\..\src\yapf\follow_track.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1081	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1082	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1083	RelativePath=".\..\src\yapf\nodelist.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1084	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1085	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1086	RelativePath=".\..\src\yapf\track_dir.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1087	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1088	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1089	RelativePath=".\..\src\yapf\yapf.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1090	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1091	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1092	RelativePath=".\..\src\yapf\yapf.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1093	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1094	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1095	RelativePath=".\..\src\yapf\yapf_base.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1096	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1097	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1098	RelativePath=".\..\src\yapf\yapf_common.cpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1099	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1100	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1101	RelativePath=".\..\src\yapf\yapf_common.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1102	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1103	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1104	RelativePath=".\..\src\yapf\yapf_costbase.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1105	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1106	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1107	RelativePath=".\..\src\yapf\yapf_costcache.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1108	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1109	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1110	RelativePath=".\..\src\yapf\yapf_costrail.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1111	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1112	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1113	RelativePath=".\..\src\yapf\yapf_destrail.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1114	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1115	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1116	RelativePath=".\..\src\yapf\yapf_node.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1117	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1118	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1119	RelativePath=".\..\src\yapf\yapf_node_rail.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1120	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1121	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1122	RelativePath=".\..\src\yapf\yapf_node_road.hpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1123	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1124	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1125	RelativePath=".\..\src\yapf\yapf_rail.cpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1126	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1127	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1128	RelativePath=".\..\src\yapf\yapf_road.cpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1129	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1130	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1131	RelativePath=".\..\src\yapf\yapf_settings.h">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1132	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1133	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1134	RelativePath=".\..\src\yapf\yapf_ship.cpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1135	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1136	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1137	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1138	Name="Video"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1139	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1140	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	1141	RelativePath=".\..\src\video\dedicated_v.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1142	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1143	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	1144	RelativePath=".\..\src\video\null_v.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1145	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1146	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	1147	RelativePath=".\..\src\video\sdl_v.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1148	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1149	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	1150	RelativePath=".\..\src\video\win32_v.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1151	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1152	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1153	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1154	Name="Music"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1155	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1156	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1157	RelativePath=".\..\src\music\dmusic.cpp">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1158	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1159	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	1160	RelativePath=".\..\src\music\null_m.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1161	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1162	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	1163	RelativePath=".\..\src\music\win32_m.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1164	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1165	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1166	<Filter
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1167	Name="Sound"
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1168	Filter="">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1169	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	1170	RelativePath=".\..\src\sound\null_s.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1171	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1172	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	1173	RelativePath=".\..\src\sound\sdl_s.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1174	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1175	<File
5838 9c3129cb019b (svn r8038) -Merge: the cpp branch. Effort of KUDr, Celestar, glx, Smoovius, stillunknown and pv2b. rubidium parents: 5774 diff changeset	1176	RelativePath=".\..\src\sound\win32_s.cpp">
5726 8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1177	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1178	</Filter>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1179	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1180	RelativePath=".\..\media\mainicon.ico">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1181	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1182	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1183	RelativePath=".\..\media\openttd.ico">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1184	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1185	<File
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1186	RelativePath=".\..\readme.txt">
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1187	</File>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1188	</Files>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1189	<Globals>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1190	</Globals>
8f399788f6c9 (svn r7759) -Merge: makefile rewrite. This merge features: rubidium parents: diff changeset	1191	</VisualStudioProject>

author	maedhros
	Mon, 19 Mar 2007 11:27:30 +0000
changeset 6658	59048224be55
parent 6599	b08cb9c93e8b
child 6691	e8c27a509894
permissions	-rw-r--r--