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 838b166726 Merge branch 'master' into jgrpp ... # Conflicts: # src/cheat_gui.cpp # src/command.cpp # src/command_func.h # src/company_base.h # src/debug.cpp # src/debug.h # src/economy.cpp # src/engine_type.h # src/graph_gui.cpp # src/misc_cmd.cpp # src/misc_cmd.h # src/network/core/os_abstraction.cpp # src/openttd.cpp # src/saveload/saveload.cpp # src/saveload/saveload.h # src/settings_type.h # src/ship_cmd.cpp # src/stdafx.h # src/tests/bitmath_func.cpp # src/town_cmd.cpp # src/town_gui.cpp		4 months ago
..
CMakeLists.txt	Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058)	2 years ago
game.hpp	Merge branch 'master' into jgrpp	4 months ago
game_config.cpp	Codechange: use std::string for script info/library finding	1 year ago
game_config.hpp	Codechange: use std::string for script info/library finding	1 year ago
game_core.cpp	Merge branch 'master' into jgrpp	4 months ago
game_gui.cpp	Merge branch 'master' into jgrpp	4 months ago
game_gui.hpp	Feature: [UI] Split AI/Game Script configuration windows and add them to world gen window (#10058)	2 years ago
game_info.cpp	Merge branch 'master' into jgrpp	4 months ago
game_info.hpp	Codechange: use std::string for script library category	1 year ago
game_instance.cpp	Adding of _t to (u)int types, and WChar to char32_t	5 months ago
game_instance.hpp	Merge branch 'master' into jgrpp	11 months ago
game_scanner.cpp	Merge branch 'master' into jgrpp	6 months ago
game_scanner.hpp	Codechange: use std::string for script info/library finding	1 year ago
game_text.cpp	Merge branch 'master' into jgrpp	4 months ago
game_text.hpp	Merge branch 'master' into jgrpp	4 months ago