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 5404be172c Merge branch 'master' into jgrpp ... # Conflicts: # src/core/bitmath_func.cpp # src/core/bitmath_func.hpp # src/core/geometry_type.hpp # src/game/game_text.hpp # src/graph_gui.cpp # src/pathfinder/npf/npf.cpp # src/script/api/script_text.cpp # src/spritecache.cpp # src/track_func.h		4 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	Codechange: Use std::string in the driver and blitter selection code.	4 years ago
bemidi.cpp	Fix: Workarounds for BeMidi driver to work properly on Haiku	3 years ago
bemidi.h	Fix: Workarounds for BeMidi driver to work properly on Haiku	3 years ago
cocoa_m.cpp	Merge branch 'master' into jgrpp	6 months 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	4 months ago
dmusic.h	Codechange: Use std::string in the driver and blitter selection code.	4 years ago
extmidi.cpp	Merge branch 'master' into jgrpp	6 months ago
extmidi.h	Merge branch 'master' into jgrpp	9 months ago
fluidsynth.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
fluidsynth.h	Codechange: Use std::string in the driver and blitter selection code.	4 years ago
midi.h	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
midifile.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
midifile.hpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
music_driver.hpp	Merge branch 'master' into jgrpp	6 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	4 months ago
win32_m.h	Codechange: Use std::string in the driver and blitter selection code.	4 years ago