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

2021-02-01 19:34:30 +00:00

..

ai_config.cpp

Codechange: Remove min/max functions in favour of STL variants (#8502)

2021-01-08 11:16:18 +01:00

ai_config.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

ai_core.cpp

Merge branch 'master' into jgrpp

2020-01-06 18:45:51 +00:00

ai_gui.cpp

Merge branch 'master' into jgrpp

2021-02-01 19:34:30 +00:00

ai_gui.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

ai_info.cpp

Codechange: Simplify CheckAPIVersion()

2020-02-14 21:43:21 +01:00

ai_info.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

ai_instance.cpp

Add third DoCommand parameter p3

2020-10-17 17:25:44 +01:00

ai_instance.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

ai_scanner.cpp

Codechange: Use std::string in file scanners.

2020-12-27 13:19:25 +01:00

ai_scanner.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

ai.hpp

Cleanup: Removed SVN headers

2019-11-10 17:59:20 +00:00

CMakeLists.txt

Add: introduce CMake for project management

2020-06-05 19:36:05 +02:00