manual merge

This commit is contained in:
commy2 2016-10-02 13:04:20 +02:00
parent f4d4c521d7
commit 56882a9bcb

View File

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