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

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/console_cmds.cpp
#	src/landscape.cpp
#	src/linkgraph/linkgraphschedule.cpp
#	src/openttd.cpp
#	src/roadveh_cmd.cpp
#	src/toolbar_gui.cpp
#	src/train_cmd.cpp
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2018-07-24 18:30:42 +01:00
parent 4bdbf3863d 8975318286
commit 035f5622b9
108 changed files with 2185 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
projects/openttd_vs90.vcproj
View File

@@ -1183,6 +1183,10 @@
RelativePath=".\..\src\fontdetection.h"
>
</File>
<File
RelativePath=".\..\src\framerate_type.h"
>
</File>
<File
RelativePath=".\..\src\base_consist.h"
>
@@ -2259,6 +2263,10 @@
RelativePath=".\..\src\fios_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\framerate_gui.cpp"
>
</File>
<File
RelativePath=".\..\src\genworld_gui.cpp"
>
@@ -2523,6 +2531,10 @@
RelativePath=".\..\src\widgets\fios_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\framerate_widget.h"
>
</File>
<File
RelativePath=".\..\src\widgets\genworld_widget.h"
>