Merge with develop

--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-01-14 23:58:34 +01:00
commit 72c70dee6a

View file

@ -19,6 +19,7 @@
#include "nel/misc/bitmap.h" #include "nel/misc/bitmap.h"
#include "nel/misc/stream.h" #include "nel/misc/stream.h"
#include "nel/misc/file.h" #include "nel/misc/file.h"
#include "nel/misc/system_info.h"
// Define this to force all bitmap white (debug) // Define this to force all bitmap white (debug)
// #define NEL_ALL_BITMAP_WHITE // #define NEL_ALL_BITMAP_WHITE