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

Merge branch 'progsig-sx' into jgrpp

Browse Source 
Conflicts:
	src/command.cpp
	src/command_type.h
	src/lang/english.txt
	src/rail_cmd.cpp
	src/rail_gui.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/saveload/saveload.cpp
	src/widgets/rail_widget.h
	src/window_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 18:15:18 +01:00
parent de76316634 de14c210db
commit 2bcbeea011
31 changed files with 2914 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
source.list
View File

@@ -76,6 +76,8 @@ screenshot.cpp
#end
settings.cpp
signal.cpp
programmable_signals.cpp
programmable_signals_gui.cpp
signs.cpp
sound.cpp
sprite.cpp
@@ -321,6 +323,7 @@ settings_type.h
ship.h
signal_func.h
signal_type.h
programmable_signals.h
signs_base.h
signs_func.h
signs_type.h
@@ -633,6 +636,7 @@ saveload/subsidy_sl.cpp
saveload/town_sl.cpp
saveload/vehicle_sl.cpp
saveload/waypoint_sl.cpp
saveload/signal_sl.cpp
saveload/extended_ver_sl.h
saveload/extended_ver_sl.cpp