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
+5 -5
View File
@@ -3,15 +3,15 @@
#include <stdio.h>
#include <string.h>
#include "stdlib.h"
#include "debug.h"
#include "DEBUG.H"
#include "MemMan.h"
#include "Overhead Types.h"
#include "random.h"
#include "campaign.h"
#include "dialogue control.h"
#include "Campaign.h"
#include "Dialogue Control.h"
#include "Map Screen Interface.h"
#include "Message.h"
#include "message.h"
#include "Game Clock.h"
#include "Strategic Mines.h"
#include "Strategic Status.h"
@@ -22,7 +22,7 @@
#include "Interface.h"
#include "Game Event Hook.h"
#include "Overhead.h"
#include "meanwhile.h"
#include "Meanwhile.h"
#include "Quests.h"
#include "Squads.h"
#include "Soldier macros.h"