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.

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		2 years ago
..
extra_signals	Add new signal type: no-entry signal	3 years ago
misc_gui	Add a baseset GRF for misc GUI sprites	2 years ago
openttd	Cleanup: Remove unused flag sprites.	2 years ago
orig_extra	Codechange: Make codestyle for CMake files consistent for 'control' statements	4 years ago
road_waypoints	Add replacement sprites for road waypoint buildings	2 years ago
CMakeLists.txt	Add replacement sprites for road waypoint buildings	2 years ago
extra_signals.grf	Add new signal type: no-entry signal	3 years ago
innerhighlight.grf	Add 3 more zoning highlight colours	4 years ago
misc_gui.grf	Add a baseset GRF for misc GUI sprites	2 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	Cleanup: Remove unused flag sprites.	2 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)	3 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)	3 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
road_waypoints.grf	Add replacement sprites for road waypoint buildings	2 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