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-11 23:27:04 +02:00
parent 217ded3492 eac57ae0a3
commit fa8a9b52fe
15 changed files with 507 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/Documentation/Designate.html
View File

@@ -1097,7 +1097,7 @@ function below will use the range 1-7 just in case</p>
<dl class="function">
<dt>
<em>#number</em>
<em></em>
<a id="#(DESIGNATE).LaseDuration" >
<strong>DESIGNATE.LaseDuration</strong>
</a>
@@ -1151,7 +1151,10 @@ function below will use the range 1-7 just in case</p>
<dl class="function">
<dt>
<<<<<<< HEAD
<em></em>
=======
>>>>>>> master
<a id="#(DESIGNATE).LaserCodes" >
<strong>DESIGNATE.LaserCodes</strong>
</a>