Merge branch 'master' into ExtraMercs

This commit is contained in:
Asdow
2025-09-24 16:14:10 +03:00
601 changed files with 4005 additions and 10278 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
* @brief This file contains declarations of classes and functions used for dynamic dialogue
*/
#include "Types.h"
#include "types.h"
#include "Soldier Control.h"
// Flugente: calculate A's opinion of B