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 FC-Capture-Zones

Browse Source
This commit is contained in:
FlightControl_Master 2017-10-09 14:47:22 +02:00
commit 9bfca83804
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Moose Mission Setup/Moose.lua
View File

@ -1,9 +1,5 @@
env.info( '*** MOOSE DYNAMIC INCLUDE START *** ' )
<<<<<<< HEAD
env.info( 'Moose Generation Timestamp: 20171006_1917' )
=======
env.info( 'Moose Generation Timestamp: 20171007_2213' )
>>>>>>> master
env.info( 'Moose Generation Timestamp: 20171009_1446' )
local base = _G

2
Moose Mission Setup/Moose_.lua
View File

@ -1,5 +1,5 @@
env.info('*** MOOSE DYNAMIC INCLUDE START *** ')
env.info('Moose Generation Timestamp: 20171007_2213')
env.info('Moose Generation Timestamp: 20171009_1446')
local base=_G
__Moose={}
__Moose.Include=function(IncludeFile)