Merge remote-tracking branch 'origin/master'

# Conflicts: # .idea/config/applicationhost.config # FWA_MAIN/bin/FWA_MAIN.dll # FWA_MAIN/bin/FWA_MAIN.pdb # FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache # FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache # FWA_MAIN/obj/Debug/FWA_MAIN.dll # FWA_MAIN/obj/Debug/FWA_MAIN.pdb
2024-03-28 19:24:14 -04:00
parent fe80a41d5c bbb273f668
commit ef6782c5c8
12 changed files with 192 additions and 28 deletions
--- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache
+++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.AssemblyReference.cache
--- a/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache
+++ b/FWA_MAIN/obj/Debug/FWA_MAIN.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-9d1cdd184476eb265233bc67136ca7e3159166a02c46b34cb16710aa0fb22e94
+d2d2a219092f2f86c27fbbb67e6e1855b3e51df134233d4f20d9e880feaa1a41
--- a/FWA_MAIN/obj/Debug/FWA_MAIN.dll
+++ b/FWA_MAIN/obj/Debug/FWA_MAIN.dll
--- a/FWA_MAIN/obj/Debug/FWA_MAIN.pdb
+++ b/FWA_MAIN/obj/Debug/FWA_MAIN.pdb