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
@@ -1,15 +1,15 @@
#include "builddefines.h"
#include "Types.h"
#include "types.h"
#include "Merc Contract.h"
#include "Soldier Profile.h"
#include "History.h"
#include "history.h"
#include "finances.h"
#include "Game Clock.h"
#include "Soldier Add.h"
#include "Dialogue Control.h"
#include "Soldier Create.h"
#include "Message.h"
#include "message.h"
#include "Font Control.h"
#include "personnel.h"
#include "LaptopSave.h"
@@ -23,7 +23,7 @@
#include "Interface Control.h"
#include "gamescreen.h"
#include "jascreens.h"
#include "Random.h"
#include "random.h"
#include "Assignments.h"
#include "Strategic Movement.h"
#include "Squads.h"
@@ -31,7 +31,7 @@
#include "Text.h"
#include "Strategic Status.h"
#include "mercs.h"
#include "insurance contract.h"
#include "insurance Contract.h"
#include "Vehicles.h"
#include "email.h"
#include "Map Screen Helicopter.h"