Merge with default

--HG--
branch : multipass-stereo
This commit is contained in:
kaetemi 2013-09-13 23:24:13 +02:00
commit 96dc139ddd
2 changed files with 4 additions and 0 deletions

View file

@ -19,6 +19,7 @@
#include "types_nl.h"
#include <cmath>
#include <nel/misc/debug.h>
namespace NLMISC
{

View file

@ -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"