Merge remote-tracking branch 'origin/master' into jgrpp

# Conflicts: # src/string.cpp
2018-12-10 18:40:05 +00:00
parent cd41683b9b 68b5b11b7c
commit 2003a86932
18 changed files with 1059 additions and 468 deletions
--- a/src/script/api/script_event_types.hpp
+++ b/src/script/api/script_event_types.hpp
@@ -363,7 +363,7 @@ private:
 class ScriptEventCompanyAskMerger : public ScriptEvent {
 public:
 	/**
-	 * @param owner The company that can be bough.
+	 * @param owner The company that can be bought.
 	 * @param value The value/costs of buying the company.
 	 */
 	ScriptEventCompanyAskMerger(Owner owner, int32 value) :