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 88670a230f Merge branch 'master' into jgrpp ... # Conflicts: # src/articulated_vehicles.cpp # src/articulated_vehicles.h # src/base_media_base.h # src/base_media_func.h # src/build_vehicle_gui.cpp # src/dock_gui.cpp # src/main_gui.cpp # src/music_gui.cpp # src/network/network_chat_gui.cpp # src/network/network_content.cpp # src/newgrf.cpp # src/newgrf_roadstop.cpp # src/os/windows/string_uniscribe.h # src/os/windows/win32.cpp # src/rail_gui.cpp # src/road.cpp # src/road_gui.cpp # src/settings.cpp # src/settings_gui.cpp # src/smallmap_gui.cpp # src/strings.cpp # src/terraform_gui.cpp # src/tests/test_script_admin.cpp # src/tests/test_window_desc.cpp # src/timer/timer_game_calendar.h # src/vehicle.cpp # src/vehicle_base.h # src/viewport.cpp # src/widget_type.h # src/window.cpp # src/window_gui.h		6 months ago
..
CMakeLists.txt	Remove: OS/2 port	12 months ago
allegro_m.cpp	Merge branch 'master' into jgrpp	6 months ago
allegro_m.h	…
bemidi.cpp	…
bemidi.h	…
cocoa_m.cpp	Merge branch 'master' into jgrpp	6 months ago
cocoa_m.h	…
dmusic.cpp	Merge branch 'master' into jgrpp	6 months ago
dmusic.h	…
extmidi.cpp	Fix: extmidi did not move on to next song after playing ends. (#11469)	6 months ago
extmidi.h	Merge branch 'master' into jgrpp	9 months ago
fluidsynth.cpp	Codechange: automatic adding of _t to (u)int types, and WChar to char32_t	11 months ago
fluidsynth.h	…
midi.h	Merge branch 'master' into jgrpp	6 months ago
midifile.cpp	Merge branch 'master' into jgrpp	6 months ago
midifile.hpp	Merge branch 'master' into jgrpp	6 months ago
music_driver.hpp	Music: Defer probing for music driver until a music set is loaded	10 months ago
null_m.cpp	…
null_m.h	Codechange: Silence warnings about intentionally unused parameters.	9 months ago
win32_m.cpp	Merge branch 'master' into jgrpp	6 months ago
win32_m.h	…