FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# 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
parent 04c2a545f2 305cb3092e
commit 5896ebe9ca
7 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/Documentation/Fsm.html
View File

@@ -1605,7 +1605,7 @@ A string defining the start state.</p>
<dl class="function">
<dt>
<em></em>
<em>#string</em>
<a id="#(FSM)._StartState" >
<strong>FSM._StartState</strong>
</a>
@@ -1904,7 +1904,6 @@ A string defining the start state.</p>
<dl class="function">
<dt>
<em></em>
<a id="#(FSM).current" >
<strong>FSM.current</strong>
</a>