Jonathan G Rennison 0a9c44d1a2 Merge branch 'master' into jgrpp ... # Conflicts: # src/airport_gui.cpp # src/blitter/32bpp_anim_sse4.cpp # src/console_cmds.cpp # src/linkgraph/linkgraph_gui.cpp # src/newgrf_object.h # src/road_gui.cpp # src/widgets/road_widget.h # src/window.cpp		2022-10-16 20:14:13 +01:00
..
extra_signals	Add new signal type: no-entry signal	2021-09-04 11:39:54 +01:00
misc_gui	Add a baseset GRF for misc GUI sprites	2022-01-21 23:34:39 +00:00
openttd	Cleanup: Remove unused flag sprites.	2022-10-16 14:56:52 +02:00
orig_extra
road_waypoints	Add replacement sprites for road waypoint buildings	2022-01-26 21:46:36 +00:00
CMakeLists.txt	Add replacement sprites for road waypoint buildings	2022-01-26 21:46:36 +00:00
extra_signals.grf	Add new signal type: no-entry signal	2021-09-04 11:39:54 +01:00
innerhighlight.grf
misc_gui.grf	Add a baseset GRF for misc GUI sprites	2022-01-21 23:34:39 +00:00
no_music.obm
no_sound.obs
openttd.grf	Cleanup: Remove unused flag sprites.	2022-10-16 14:56:52 +02:00
opntitle.dat
orig_dos_de.obg
orig_dos.obg
orig_dos.obm
orig_dos.obs
orig_extra.grf
orig_tto.obm
orig_win.obg
orig_win.obm
orig_win.obs
progsignals.grf
road_waypoints.grf	Add replacement sprites for road waypoint buildings	2022-01-26 21:46:36 +00:00
route_step.grf
tracerestrict.grf