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
+6 -6
View File
@@ -2,16 +2,16 @@
#include "Morale.h"
#include "Overhead.h"
#include "Soldier Profile.h"
#include "dialogue control.h"
#include "Dialogue Control.h"
#include "Map Screen Interface.h"
#include "message.h"
#include "assignments.h"
#include "Assignments.h"
#include "Strategic Movement.h"
#include "Strategic Status.h"
#include "SkillCheck.h"
#include "drugs and alcohol.h"
#include "StrategicMap.h"
#include "Debug.h"
#include "Drugs And Alcohol.h"
#include "strategicmap.h"
#include "DEBUG.H"
#include "Squads.h"
#include "ai.h"
#include "Campaign.h"
@@ -33,7 +33,7 @@
#include "connect.h"
#include "fresh_header.h"
#include "Random.h"
#include "random.h"
#include "Merc Contract.h"