Merge from Git repository

--HG-- branch : develop
6 years ago · 583e53cecd
parent 39eb30b64f 08ac7175dc
commit 583e53cecd
1 changed files with 3 additions and 0 deletions
--- a/code/nel/src/misc/stdmisc.h
+++ b/code/nel/src/misc/stdmisc.h
@ -20,8 +20,11 @@
 #if defined(_MSC_VER) && defined(_DEBUG)
 	#define _CRTDBG_MAP_ALLOC
 	#include <stdlib.h>
 	#include <malloc.h>
 	#include <crtdbg.h>
 	#define DEBUG_NEW new(_NORMAL_BLOCK, __FILE__, __LINE__)
 #elif defined(_MSC_VER)
 	#include <malloc.h>
 #endif
 #include <algorithm>