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/video
Jonathan G Rennison f8d6e781ba Merge branch 'master' into jgrpp
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
4 years ago
..
cocoa Merge branch 'master' into jgrpp 4 years ago
allegro_v.cpp Merge branch 'master' into jgrpp 4 years ago
allegro_v.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
dedicated_v.cpp Merge branch 'master' into jgrpp 4 years ago
dedicated_v.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
null_v.cpp Merge branch 'master' into jgrpp 4 years ago
null_v.h Merge branch 'master' into jgrpp 4 years ago
sdl2_v.cpp Merge branch 'master' into jgrpp 4 years ago
sdl2_v.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
sdl_v.cpp Merge branch 'master' into jgrpp 4 years ago
sdl_v.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago
video_driver.hpp Merge branch 'master' into jgrpp 4 years ago
win32_v.cpp Merge branch 'master' into jgrpp 4 years ago
win32_v.h Codechange: Use std::string in the driver and blitter selection code. 4 years ago