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 041e71ec05 Merge branch 'master' into jgrpp ... # Conflicts: # src/crashlog.cpp # src/gfx.cpp # src/network/network_client.cpp # src/openttd.cpp # src/openttd.h # src/saveload/saveload.cpp # src/survey.cpp		2 months ago
..
cocoa	Merge branch 'master' into jgrpp	2 months ago
CMakeLists.txt	…
allegro_v.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
allegro_v.h	…
dedicated_v.cpp	Merge branch 'master' into jgrpp	2 months ago
dedicated_v.h	…
null_v.cpp	Merge branch 'master' into jgrpp	2 months ago
null_v.h	…
opengl.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
opengl.h	Adding of _t to (u)int types, and WChar to char32_t	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	Merge branch 'master' into jgrpp	3 months ago
sdl2_v.cpp	Merge branch 'master' into jgrpp	4 months ago
sdl2_v.h	Merge branch 'master' into jgrpp	3 months ago
sdl_v.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
sdl_v.h	…
video_driver.cpp	Merge branch 'master' into jgrpp	3 months ago
video_driver.hpp	Merge branch 'master' into jgrpp	3 months ago
win32_v.cpp	Merge tag '14.0-beta1' into jgrpp	3 months ago
win32_v.h	Merge branch 'master' into jgrpp	3 months ago