dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into depature-boards

Browse Source 
Conflicts:
	src/table/strgen_tables.h
This commit is contained in:
Jonathan G Rennison
2015-08-01 19:57:09 +01:00
parent 79138de1b9 67366cf03d
commit 526cb42608
133 changed files with 2582 additions and 1718 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
projects/openttd_vs100.vcxproj
View File

@@ -898,6 +898,7 @@
<ClInclude Include="..\src\table\sprites.h" />
<ClInclude Include="..\src\table\station_land.h" />
<ClInclude Include="..\src\table\strgen_tables.h" />
<ClInclude Include="..\src\table\string_colours.h" />
<ClInclude Include="..\src\..\objs\langs\table\strings.h" />
<ClInclude Include="..\src\table\town_land.h" />
<ClInclude Include="..\src\table\townname.h" />

3
projects/openttd_vs100.vcxproj.filters
View File

@@ -1923,6 +1923,9 @@
<ClInclude Include="..\src\table\strgen_tables.h">
<Filter>Tables</Filter>
</ClInclude>
<ClInclude Include="..\src\table\string_colours.h">
<Filter>Tables</Filter>
</ClInclude>
<ClInclude Include="..\src\..\objs\langs\table\strings.h">
<Filter>Tables</Filter>
</ClInclude>

4
projects/openttd_vs80.vcproj
View File

@@ -2910,6 +2910,10 @@
RelativePath=".\..\src\table\strgen_tables.h"
>
</File>
<File
RelativePath=".\..\src\table\string_colours.h"
>
</File>
<File
RelativePath=".\..\src\..\objs\langs\table\strings.h"
>

4
projects/openttd_vs90.vcproj
View File

@@ -2907,6 +2907,10 @@
RelativePath=".\..\src\table\strgen_tables.h"
>
</File>
<File
RelativePath=".\..\src\table\string_colours.h"
>
</File>
<File
RelativePath=".\..\src\..\objs\langs\table\strings.h"
>