Commit Graph

4 Commits

Author SHA1 Message Date
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
2019-11-12 18:43:10 +00:00
Jonathan G Rennison
07ca7cfb8c Add show passenger and show freight buttons to departure window 2017-09-22 22:24:44 +01:00
Jonathan G Rennison
3576488527 Fix departures_widget.h being missing from source.list
Fix whitespace issues.
2015-11-01 11:15:59 +00:00
patch-import
79138de1b9 Import departure boards patch 2015-08-01 19:48:19 +01:00