Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

manual merge

Browse Source
This commit is contained in:
commy2 2016-10-02 13:02:17 +02:00
commit f4d4c521d7
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
addons/medical/script_component.hpp
View File

@ -2,8 +2,13 @@
#define COMPONENT_BEAUTIFIED Medical Core #define COMPONENT_BEAUTIFIED Medical Core
#include "\z\ace\addons\main\script_mod.hpp" #include "\z\ace\addons\main\script_mod.hpp"
<<<<<<< HEAD
//#define DEBUG_MODE_FULL //#define DEBUG_MODE_FULL
#define DISABLE_COMPILE_CACHE #define DISABLE_COMPILE_CACHE
=======
// #define DEBUG_MODE_FULL
// #define DISABLE_COMPILE_CACHE
>>>>>>> origin/master
// #define ENABLE_PERFORMANCE_COUNTERS // #define ENABLE_PERFORMANCE_COUNTERS
#ifdef DEBUG_ENABLED_MEDICAL #ifdef DEBUG_ENABLED_MEDICAL

2
addons/medical_blood/script_component.hpp
View File

@ -2,7 +2,7 @@
#define COMPONENT_BEAUTIFIED Medical Blood #define COMPONENT_BEAUTIFIED Medical Blood
#include "\z\ace\addons\main\script_mod.hpp" #include "\z\ace\addons\main\script_mod.hpp"
//#define DEBUG_ENABLED_MEDICAL_BLOOD // #define DEBUG_ENABLED_MEDICAL_BLOOD
#define DISABLE_COMPILE_CACHE #define DISABLE_COMPILE_CACHE
// #define ENABLE_PERFORMANCE_COUNTERS // #define ENABLE_PERFORMANCE_COUNTERS