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/src/music
Jonathan G Rennison b7ddd486cf Merge branch 'master' into jgrpp
# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp
3 years ago
..
CMakeLists.txt Codechange: Make codestyle for CMake files consistent for 'control' statements 4 years ago
allegro_m.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
allegro_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
bemidi.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
bemidi.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
cocoa_m.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
cocoa_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
dmusic.cpp Merge branch 'master' into jgrpp 3 years ago
dmusic.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
extmidi.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
extmidi.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
fluidsynth.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
fluidsynth.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
midi.h Cleanup: Removed SVN headers 5 years ago
midifile.cpp Codechange: Remove min/max functions in favour of STL variants (#8502) 3 years ago
midifile.hpp Cleanup: Removed SVN headers 5 years ago
music_driver.hpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
null_m.cpp Cleanup: Removed SVN headers 5 years ago
null_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
os2_m.cpp Codechange: Use std::string in the driver and blitter selection code. 4 years ago
os2_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
win32_m.cpp Merge branch 'master' into jgrpp 3 years ago
win32_m.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago