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 c5b3c18bb5 Merge branch 'master' into jgrpp
# Conflicts:
#	src/company_func.h
#	src/core/overflowsafe_type.hpp
#	src/engine.cpp
#	src/music/midifile.cpp
#	src/network/network_command.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_spritegroup.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/road_gui.cpp
#	src/saveload/engine_sl.cpp
#	src/settings_gui.cpp
#	src/settings_type.h
#	src/strings.cpp
#	src/table/settings/game_settings.ini
5 months ago
..
cocoa Merge branch 'master' into jgrpp 5 months ago
CMakeLists.txt
allegro_v.cpp Merge branch 'master' into jgrpp 9 months ago
allegro_v.h
dedicated_v.cpp Merge branch 'master' into jgrpp 6 months ago
dedicated_v.h
null_v.cpp Merge branch 'master' into jgrpp 6 months ago
null_v.h
opengl.cpp Merge branch 'master' into jgrpp 5 months ago
opengl.h Merge branch 'master' into jgrpp 5 months ago
sdl2_default_v.cpp MinGW: Remove direct mingw-std-threads includes 6 months ago
sdl2_default_v.h
sdl2_opengl_v.cpp MinGW: Remove direct mingw-std-threads includes 6 months ago
sdl2_opengl_v.h Make VideoDriver::GetAnimBuffer a non-virtual/inlinable function 10 months ago
sdl2_v.cpp Merge branch 'master' into jgrpp 6 months ago
sdl2_v.h MinGW: Remove direct mingw-std-threads includes 6 months ago
sdl_v.cpp Merge branch 'master' into jgrpp 9 months ago
sdl_v.h
video_driver.cpp Merge branch 'master' into jgrpp 9 months ago
video_driver.hpp Merge branch 'master' into jgrpp 6 months ago
win32_v.cpp Merge branch 'master' into jgrpp 5 months ago
win32_v.h MinGW: Remove direct mingw-std-threads includes 6 months ago