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

Browse Source 
# Conflicts:
#	Moose Development/Moose/Core/Message.lua
This commit is contained in:
Applevangelist
2024-06-30 16:02:11 +02:00
parent 9479b338c5 9ca30fc00c
commit 0058383e64
2 changed files with 63 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Core/UserFlag.lua
View File

@@ -58,7 +58,7 @@ do -- UserFlag
--- Set the userflag to a given Number.
-- @param #USERFLAG self
-- @param #number Number The number value to be checked if it is the same as the userflag.
-- @param #number Number The number value to set the flag to.
-- @param #number Delay Delay in seconds, before the flag is set.
-- @return #USERFLAG The userflag instance.
-- @usage
@@ -104,4 +104,4 @@ do -- UserFlag
end
end
end