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 483e3172af Merge branch 'master' into jgrpp
# Conflicts:
#	src/core/strong_typedef_type.hpp
#	src/gfx.cpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/map_func.h
#	src/newgrf_debug_gui.cpp
#	src/order_cmd.cpp
#	src/pathfinder/follow_track.hpp
#	src/rail_cmd.cpp
#	src/road_cmd.cpp
#	src/road_gui.cpp
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/smallmap_gui.cpp
#	src/station_cmd.cpp
#	src/strings.cpp
#	src/tile_type.h
#	src/timetable_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/viewport.cpp
2 years ago
..
cocoa Merge branch 'master' into jgrpp 2 years ago
CMakeLists.txt
allegro_v.cpp Merge branch 'master' into jgrpp 2 years ago
allegro_v.h
dedicated_v.cpp Merge branch 'master' into jgrpp 2 years ago
dedicated_v.h
null_v.cpp Fix: thread safety issue during exiting the game (#9380) 3 years ago
null_v.h
opengl.cpp Merge branch 'master' into jgrpp 2 years ago
opengl.h Cleanup: remove/replace trailing ; with . in comments 2 years ago
sdl2_default_v.cpp Codechange: use _cur_palette the same in all the drivers 3 years ago
sdl2_default_v.h
sdl2_opengl_v.cpp Merge branch 'master' into jgrpp 2 years ago
sdl2_opengl_v.h
sdl2_v.cpp Merge branch 'master' into jgrpp 2 years ago
sdl2_v.h Merge branch 'master' into jgrpp 2 years ago
sdl_v.cpp Merge branch 'master' into jgrpp 2 years ago
sdl_v.h
video_driver.cpp Fix: don't propagate shift/ctrl state till next game-tick (#9381) 3 years ago
video_driver.hpp Merge tag '13.0-beta2' into jgrpp 2 years ago
win32_v.cpp Merge branch 'master' into jgrpp 2 years ago
win32_v.h Merge branch 'master' into jgrpp 2 years ago