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 Grey-Echo

Browse Source 
# Conflicts:
#	Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
#	Moose Mission Setup/Moose.lua
This commit is contained in:
FlightControl 2017-03-23 05:28:09 +01:00
commit 63973e4e2d
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua
View File

@ -1,5 +1,9 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' ) env.info( '*** MOOSE STATIC INCLUDE START *** ' )
<<<<<<< HEAD
env.info( 'Moose Generation Timestamp: 20170322_2149' ) env.info( 'Moose Generation Timestamp: 20170322_2149' )
=======
env.info( 'Moose Generation Timestamp: 20170322_1812' )
>>>>>>> refs/remotes/origin/master
local base = _G local base = _G
Include = {} Include = {}

4
Moose Mission Setup/Moose.lua
View File

@ -1,5 +1,9 @@
env.info( '*** MOOSE STATIC INCLUDE START *** ' ) env.info( '*** MOOSE STATIC INCLUDE START *** ' )
<<<<<<< HEAD
env.info( 'Moose Generation Timestamp: 20170322_2149' ) env.info( 'Moose Generation Timestamp: 20170322_2149' )
=======
env.info( 'Moose Generation Timestamp: 20170322_1812' )
>>>>>>> refs/remotes/origin/master
local base = _G local base = _G
Include = {} Include = {}