You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
OpenTTD-patches/media/baseset
Jonathan G Rennison 7154f8859d Merge tag '1.11.0-beta1' into jgrpp
# Conflicts:
#	src/console_cmds.cpp
#	src/gfx_func.h
#	src/industry.h
#	src/lang/czech.txt
#	src/lang/estonian.txt
#	src/lang/german.txt
#	src/lang/indonesian.txt
#	src/lang/japanese.txt
#	src/lang/norwegian_bokmal.txt
#	src/lang/russian.txt
#	src/lang/slovak.txt
#	src/saveload/saveload.h
#	src/station_gui.cpp
#	src/town_gui.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/waypoint_gui.cpp
3 years ago
..
openttd Add: [NewGRF] new GUI sprites for 'rename' and 'go to location'. 3 years ago
orig_extra Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago
CMakeLists.txt Merge branch 'master' into jgrpp 4 years ago
innerhighlight.grf Add 3 more zoning highlight colours 4 years ago
no_music.obm Codechange: rework how grf and ob[msg] are generated 4 years ago
no_sound.obs Codechange: rework how grf and ob[msg] are generated 4 years ago
openttd.grf Add: [NewGRF] new GUI sprites for 'rename' and 'go to location'. 3 years ago
opntitle.dat Codechange: rework how grf and ob[msg] are generated 4 years ago
orig_dos.obg Codechange: rework how grf and ob[msg] are generated 4 years ago
orig_dos.obm Fix #8313: use correct capitalization for TTO / DOS base-music (#8385) 4 years ago
orig_dos.obs Codechange: rework how grf and ob[msg] are generated 4 years ago
orig_dos_de.obg Codechange: rework how grf and ob[msg] are generated 4 years ago
orig_extra.grf Codechange: rework how grf and ob[msg] are generated 4 years ago
orig_tto.obm Fix #8313: use correct capitalization for TTO / DOS base-music (#8385) 4 years ago
orig_win.obg Codechange: rework how grf and ob[msg] are generated 4 years ago
orig_win.obm Codechange: rework how grf and ob[msg] are generated 4 years ago
orig_win.obs Codechange: rework how grf and ob[msg] are generated 4 years ago
progsignals.grf CMake: Move built in GRfs to baseset dir 4 years ago
route_step.grf CMake: Move built in GRfs to baseset dir 4 years ago
tracerestrict.grf CMake: Move built in GRfs to baseset dir 4 years ago