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 ae9b416684 Merge branch 'master' into jgrpp ... # Conflicts: # src/ai/ai_core.cpp # src/ai/ai_gui.cpp # src/ai/ai_instance.cpp # src/console_cmds.cpp # src/engine_type.h # src/game/game_gui.cpp # src/game/game_instance.cpp # src/goal.cpp # src/goal_cmd.h # src/lang/english.txt # src/lang/estonian.txt # src/network/network_client.cpp # src/newgrf.cpp # src/newgrf_generic.h # src/openttd.cpp # src/saveload/saveload.h # src/script/api/script_log.cpp # src/script/api/script_town.cpp # src/settings_table.cpp # src/station_cmd.cpp # src/station_cmd.h # src/station_map.h # src/strings.cpp # src/table/settings/difficulty_settings.ini # src/table/settings/gui_settings.ini # src/tbtr_template_gui_main.h # src/timetable_cmd.cpp # src/timetable_cmd.h # src/timetable_gui.cpp # src/town_gui.cpp # src/train_gui.cpp # src/water_cmd.cpp		1 year ago
..
CMakeLists.txt	Add: introduce CMake for project management	4 years ago
ai.hpp	Codechange: move windows common to AI and GS out of ai_gui	1 year ago
ai_config.cpp	Codechange: Remove min/max functions in favour of STL variants (#8502)	4 years ago
ai_config.hpp	Cleanup: Removed SVN headers	5 years ago
ai_core.cpp	Merge branch 'master' into jgrpp	1 year ago
ai_gui.cpp	Merge branch 'master' into jgrpp	1 year 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	2 years ago
ai_info.hpp	Cleanup: Removed SVN headers	5 years ago
ai_instance.cpp	Merge branch 'master' into jgrpp	1 year ago
ai_instance.hpp	Codechange: Pass unpacked command arguments to command callbacks (except Script).	3 years ago
ai_scanner.cpp	Merge branch 'master' into jgrpp	1 year ago
ai_scanner.hpp	Cleanup: Removed SVN headers	5 years ago