Merge with develop

--HG-- branch : compatibility-develop
2016-01-14 23:58:34 +01:00 · 2016-01-14 23:58:34 +01:00 · 72c70dee6a
commit 72c70dee6a
parent f54b41f5cc 9a34434cf8
1 changed files with 1 additions and 0 deletions
--- a/code/nel/src/misc/bitmap.cpp
+++ b/code/nel/src/misc/bitmap.cpp
@ -19,6 +19,7 @@
 #include "nel/misc/bitmap.h"
 #include "nel/misc/stream.h"
 #include "nel/misc/file.h"
+#include "nel/misc/system_info.h"

 // Define this to force all bitmap white (debug)
 // #define NEL_ALL_BITMAP_WHITE