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 ed1b842ad3 Merge branch 'master' into jgrpp ... # Conflicts: # src/console.cpp # src/console_func.h # src/network/network_server.cpp # src/os/unix/unix.cpp # src/spritecache.cpp # src/viewport.cpp		9 months ago
..
cocoa	Merge branch 'master' into jgrpp	9 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	9 months ago
dedicated_v.h	…
null_v.cpp	Move upstream saveload to src/saveload/, move jgrpp saveload to src/sl/	12 months ago
null_v.h	…
opengl.cpp	Blitter: Change some informational virtual functions to member values	9 months ago
opengl.h	Blitter: Change some informational virtual functions to member values	9 months ago
sdl2_default_v.cpp	Codechange: replace error/usererror printf variant with fmt variant and rename	1 year ago
sdl2_default_v.h	…
sdl2_opengl_v.cpp	…
sdl2_opengl_v.h	Make VideoDriver::GetAnimBuffer a non-virtual/inlinable function	10 months ago
sdl2_v.cpp	Merge branch 'master' into jgrpp	9 months ago
sdl2_v.h	Add various missing includes	11 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	9 months ago
win32_v.cpp	Merge branch 'master' into jgrpp	9 months ago
win32_v.h	Make VideoDriver::GetAnimBuffer a non-virtual/inlinable function	10 months ago