Merge branch 'departure-boards-sx' into jgrpp
Conflicts: src/saveload/extended_ver_sl.cpp src/saveload/extended_ver_sl.h src/window_type.h
This commit is contained in:
@@ -18,6 +18,7 @@ currency.cpp
|
||||
date.cpp
|
||||
debug.cpp
|
||||
dedicated.cpp
|
||||
departures.cpp
|
||||
depot.cpp
|
||||
disaster_vehicle.cpp
|
||||
driver.cpp
|
||||
@@ -173,6 +174,9 @@ date_gui.h
|
||||
date_type.h
|
||||
debug.h
|
||||
video/dedicated_v.h
|
||||
departures_func.h
|
||||
departures_gui.h
|
||||
departures_type.h
|
||||
depot_base.h
|
||||
depot_func.h
|
||||
depot_map.h
|
||||
@@ -460,6 +464,7 @@ cheat_gui.cpp
|
||||
company_gui.cpp
|
||||
console_gui.cpp
|
||||
date_gui.cpp
|
||||
departures_gui.cpp
|
||||
depot_gui.cpp
|
||||
dock_gui.cpp
|
||||
engine_gui.cpp
|
||||
|
||||
Reference in New Issue
Block a user