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/master' into MissileTrainer

Browse Source 
# Conflicts:
#	Embedded/Moose_Embedded.lua
#	Moose/MissileTrainer.lua
#	Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.lua
#	Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz
This commit is contained in:
Sven Van de Velde
2016-05-18 11:09:21 +02:00
parent df783226cb
commit 1cb97aca38
6 changed files with 119 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/Escort.html
View File

@@ -1835,7 +1835,6 @@ self</p>
<dl class="function">
<dt>
<em></em>
<a id="#(ESCORT).ReportTargetsScheduler" >
<strong>ESCORT.ReportTargetsScheduler</strong>
</a>