Merge with default

--HG-- branch : multipass-stereo
12 years ago · 96dc139ddd
parent d2bc32e598 df123d6b89
commit 96dc139ddd
2 changed files with 4 additions and 0 deletions
--- a/code/nel/include/nel/misc/fast_floor.h
+++ b/code/nel/include/nel/misc/fast_floor.h
@ -19,6 +19,7 @@
 #include "types_nl.h"
 #include <cmath>
 #include <nel/misc/debug.h>
 namespace NLMISC
 {
--- a/code/nel/src/misc/p_thread.cpp
+++ b/code/nel/src/misc/p_thread.cpp
@ -17,6 +17,9 @@
 #include "stdmisc.h"
 #include <nel/misc/types_nl.h>
 #include <nel/misc/debug.h>
 #ifdef NL_OS_UNIX
 #include "nel/misc/p_thread.h"