weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into funkyfranky

Browse Source
This commit is contained in:
funkyfranky
2017-09-14 08:28:37 +02:00
parent 27e32486fd 887faacdb1
commit e0158a9a66
9 changed files with 3573 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/Documentation/Settings.html
View File

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