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 6459e62fff Merge branch 'master' into jgrpp ... # Conflicts: # src/lang/english.txt # src/map_type.h # src/network/network_command.cpp # src/object_cmd.cpp # src/rail_cmd.cpp # src/road_cmd.cpp # src/road_func.h # src/saveload/afterload.cpp # src/saveload/saveload.h # src/settings_gui.cpp # src/string.cpp # src/table/road_land.h # src/table/settings/game_settings.ini # src/table/settings/world_settings.ini # src/tbtr_template_gui_main.h # src/train_cmd.cpp		2 years ago
..
cocoa	Revert "Disable OSX touchbar support, fixes #358"	2 years ago
CMakeLists.txt	…
allegro_v.cpp	…
allegro_v.h	…
dedicated_v.cpp	Show failure reason in message box when network savegame load fails	2 years ago
dedicated_v.h	…
null_v.cpp	…
null_v.h	…
opengl.cpp	Merge branch 'master' into jgrpp	2 years ago
opengl.h	Cleanup: Remove svn-style `$Id$` comments. (#10122)	2 years ago
sdl2_default_v.cpp	…
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	…
sdl_v.h	…
video_driver.cpp	…
video_driver.hpp	Merge branch 'master' 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