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 a98a56669b Merge branch 'master' into jgrpp ... # Conflicts: # regression/regression/result.txt # src/autoreplace_cmd.cpp # src/industry_gui.cpp # src/landscape.cpp # src/network/network_content.cpp # src/newgrf_roadstop.cpp # src/pathfinder/yapf/yapf_ship.cpp # src/road_gui.cpp # src/saveload/ai_sl.cpp # src/saveload/saveload.h # src/saveload/vehicle_sl.cpp # src/station.cpp # src/station_gui.cpp # src/video/cocoa/cocoa_ogl.h # src/video/sdl2_opengl_v.h # src/video/video_driver.hpp # src/video/win32_v.h # src/widget_type.h # src/widgets/dropdown.cpp # src/widgets/dropdown_type.h # src/window.cpp		3 months ago
..
CMakeLists.txt	Add: introduce CMake for project management	4 years ago
ai.hpp	Merge branch 'master' into jgrpp	3 months ago
ai_config.cpp	Change: Store running AI config inside Company (#12003)	4 months ago
ai_config.hpp	Codechange: use std::string for script info/library finding	1 year ago
ai_core.cpp	Merge branch 'master' into jgrpp	3 months ago
ai_gui.cpp	Merge tag '14.0-beta2' into jgrpp	3 months ago
ai_gui.hpp	Codechange: move windows common to AI and GS out of ai_gui	1 year ago
ai_info.cpp	Merge branch 'master' into jgrpp	4 months ago
ai_info.hpp	Codechange: use std::string for script library category	1 year ago
ai_instance.cpp	Merge branch 'master' into jgrpp	3 months ago
ai_instance.hpp	Merge branch 'master' into jgrpp	11 months ago
ai_scanner.cpp	Merge branch 'master' into jgrpp	6 months ago
ai_scanner.hpp	Codechange: use std::string for script info/library finding	1 year ago