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 cbdd9f84d8 Merge branch 'master' into jgrpp
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
5 years ago
..
cocoa Merge branch 'master' into jgrpp 5 years ago
allegro_v.cpp Merge branch 'master' into jgrpp 5 years ago
allegro_v.h Cleanup: Removed SVN headers 5 years ago
dedicated_v.cpp Cleanup: Removed SVN headers 5 years ago
dedicated_v.h Cleanup: Removed SVN headers 5 years ago
null_v.cpp Merge branch 'master' into jgrpp 5 years ago
null_v.h Merge branch 'master' into jgrpp 5 years ago
sdl2_v.cpp Merge branch 'master' into jgrpp 5 years ago
sdl2_v.h Cleanup: Removed SVN headers 5 years ago
sdl_v.cpp Merge branch 'master' into jgrpp 5 years ago
sdl_v.h Cleanup: Removed SVN headers 5 years ago
video_driver.hpp Merge branch 'master' into jgrpp 5 years ago
win32_v.cpp Merge branch 'master' into jgrpp 5 years ago
win32_v.h Cleanup: Removed SVN headers 5 years ago