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 8eb27e1ac7 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_cmd.cpp
#	src/lang/japanese.txt
#	src/network/core/config.h
#	src/network/core/packet.cpp
#	src/network/core/tcp.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/toolbar_gui.cpp
#	src/vehicle_gui_base.h
3 years ago
..
openttd Change: use icons to indicate you/host in Online Players GUI 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 Change: use icons to indicate you/host in Online Players GUI 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