OpenTTD-patches/media/baseset
Jonathan G Rennison 3ec25ffc9a Merge branch 'master' into jgrpp
# Conflicts:
#	.github/workflows/ci-emscripten.yml
#	cmake/scripts/FindVersion.cmake
#	src/main_gui.cpp
#	src/road_gui.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/table/sprites.h
#	src/table/station_land.h
#	src/viewport_gui.cpp
#	src/widgets/smallmap_widget.h
2024-09-16 18:29:36 +01:00
..
extra_signals
misc_gui
openttd Add: Road waypoint default graphics 2024-06-24 22:12:08 +02:00
orig_extra
CMakeLists.txt Merge branch 'master' into jgrpp 2024-09-16 18:29:36 +01:00
extra_signals.grf
innerhighlight.grf
misc_gui.grf
no_music.obm
no_sound.obs
OpenTTD-font.md Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
OpenTTD-Mono.ttf Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
OpenTTD-Sans.ttf Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
OpenTTD-Serif.ttf Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
OpenTTD-Small.ttf Change: Update OpenTTD TTF fonts to v0.6 2024-03-11 22:36:37 +01:00
openttd.grf Add: Road waypoint default graphics 2024-06-24 22:12:08 +02:00
openttd.grf.hash Add: Road waypoint default graphics 2024-06-24 22:12:08 +02:00
opntitle.dat
orig_dos_de.obg
orig_dos.obg
orig_dos.obm
orig_dos.obs
orig_extra.grf
orig_extra.grf.hash
orig_tto.obm
orig_win.obg
orig_win.obm
orig_win.obs
progsignals.grf
route_step.grf
tracerestrict.grf