W0LF/DayZ-Epoch
1
0
Fork 0
mirror of https://github.com/EpochModTeam/DayZ-Epoch.git synced 2025-12-15 04:23:13 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix Merge Conflict 1

Browse Source
This commit is contained in:
icomrade
2016-03-03 22:09:38 -05:00
parent bad0a2e461 479097e7a8
commit 61c64cb14a
175 changed files with 9333 additions and 7650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
SQF/dayz_code/config.cpp
View File

@@ -116,5 +116,21 @@ class CfgAddons
#include "Configs\RscDisplay\safegui.hpp"
#include "Configs\RscDisplay\dialog.hpp"
#include "Configs\RscDisplay\deathboards.hpp"
<<<<<<< HEAD
=======
#include "Configs\CfgVehicles.hpp"
#include "Configs\CfgWeapons.hpp"
#include "Configs\CfgCrafting\CfgCrafting.hpp"
#include "Configs\CfgVoice.hpp"
#include "Configs\CfgIdentities.hpp"
#include "Configs\CfgFaces.hpp"
#include "Configs\CfgGlasses.hpp"
#include "Configs\CfgMagazines.hpp"
#include "Configs\CfgMarkers.hpp"
#include "Configs\CfgAmmo.hpp"
#include "Configs\CfgLoot\CfgBuildingLoot.hpp"
#include "Configs\CfgArma.hpp"
>>>>>>> upstream/master
#include "Configs\CfgExtra\snappoints.hpp"
#include "external\R3F_Realism\R3F_Weight\R3F_CfgWeight.h"