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 650d5e014e Merge branch 'master' into jgrpp ... # Conflicts: # src/ai/ai_gui.cpp # src/company_cmd.cpp # src/lang/estonian.txt # src/lang/german.txt # src/lang/hungarian.txt # src/lang/korean.txt # src/lang/slovak.txt # src/main_gui.cpp # src/video/sdl2_v.cpp		3 years ago
..
cocoa	Merge tag '1.11.0-beta1' into jgrpp	3 years ago
CMakeLists.txt	Codechange: Make codestyle for CMake files consistent for 'control' statements	4 years ago
allegro_v.cpp	Merge tag '1.11.0-beta1' into jgrpp	3 years ago
allegro_v.h	Codechange: Use std::string in the driver and blitter selection code.	4 years ago
dedicated_v.cpp	Merge tag '1.11.0-beta1' into jgrpp	3 years ago
dedicated_v.h	Codechange: Use std::string in the driver and blitter selection code.	4 years ago
null_v.cpp	Merge tag '1.11.0-beta1' into jgrpp	3 years ago
null_v.h	Merge branch 'master' into jgrpp	4 years ago
sdl2_v.cpp	Merge branch 'master' into jgrpp	3 years ago
sdl2_v.h	Codechange: [SDL2] Rework how palette is updated	3 years ago
sdl_v.cpp	Merge tag '1.11.0-beta1' into jgrpp	3 years ago
sdl_v.h	Codechange: Use std::string in the driver and blitter selection code.	4 years ago
video_driver.hpp	Merge tag '1.11.0-beta1' into jgrpp	3 years ago
win32_v.cpp	Merge tag '1.11.0-beta1' into jgrpp	3 years ago
win32_v.h	Feature: Choose a sensible window size on a fresh OTTD config file. (#8536)	3 years ago