Merge remote-tracking branch 'refs/remotes/origin/Release-2.2.0'

# Conflicts:
#	Moose Mission Setup/Moose.lua
#	Moose Mission Setup/Moose_.lua
This commit is contained in:
FlightControl_Master
2017-10-09 13:32:53 +02:00
7 changed files with 16 additions and 7 deletions

View File

@@ -1247,7 +1247,7 @@ true if metric.</p>
<dl class="function">
<dt>
<em>#boolean</em>
<em></em>
<a id="#(SETTINGS).Metric" >
<strong>SETTINGS.Metric</strong>
</a>