Merge branch 'develop' into FF/Develop

This commit is contained in:
funkyfranky
2018-09-18 11:03:31 +02:00
11 changed files with 3645 additions and 3262 deletions

View File

@@ -983,8 +983,6 @@ do -- Group
-- @param #Group self
-- @return #Group.Category
--TODO check coalition.side
--- Returns the coalition of the group.
-- @function [parent=#Group] getCoalition
-- @param #Group self