Merge branch 'master' into NDK

Former-commit-id: f118c029ca94296495957816f910d412ae8a56f2
2015-03-18 20:44:52 +01:00
parent cdd3e9e8f2 4b09757f63
commit 5c3720feb1
66 changed files with 1430 additions and 599 deletions
--- a/include/Nazara/Core/Thread.hpp
+++ b/include/Nazara/Core/Thread.hpp
@@ -10,7 +10,7 @@
 #include <Nazara/Prerequesites.hpp>
 #include <Nazara/Core/Functor.hpp>
 #include <Nazara/Core/NonCopyable.hpp>
-#include <ostream>
+#include <iosfwd>

 class NzThreadImpl;