Rolf Geuenich 2946c2e225 Merge branch 'master' into develop ...

# Conflicts:
#	Moose Development/Moose/Functional/Artillery.lua

2024-01-12 15:45:50 +01:00

..

.vscode

Update settings.json

2023-02-08 16:30:44 +01:00

Actions

Fixed broken links

2023-10-31 15:44:07 +01:00

AI

Fix broken link in AI_Escort_Request.lua

2024-01-02 22:06:59 +01:00

Cargo

CARGO noise

2023-12-30 16:50:12 +01:00

Core

Downpatching changes from development to master in Arty.lua

2024-01-12 15:44:28 +01:00

Functional

Merge branch 'master' into develop

2024-01-12 15:45:50 +01:00

Ops

Merge remote-tracking branch 'origin/master' into develop

2024-01-11 17:14:43 +01:00

Sound

SRS changes

2024-01-09 17:28:58 +01:00

Tasking

Fix for broken links in master branch

2024-01-02 13:33:10 +01:00

Utilities

Correction

2024-01-11 17:31:40 +01:00

Wrapper

Merge remote-tracking branch 'origin/master' into develop

2024-01-11 12:52:42 +01:00

.editorconfig

Merge docu changes (#1818)

2022-10-29 10:49:18 +02:00

DCS.lua

#CONTROLLABLE

2023-10-24 13:45:43 +02:00

Globals.lua

Merge docu changes (#1818)

2022-10-29 10:49:18 +02:00

Modules_local.lua

Merge remote-tracking branch 'origin/master' into develop

2023-09-08 11:20:11 +02:00

Modules.lua

Changed order to match master branch for better auto-merge

2024-01-11 10:05:22 +01:00