Merge branch 'master' into NDK

Conflicts: include/Nazara/Core/ConditionVariable.hpp Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213
2015-08-21 12:49:05 +02:00
parent dce9831c19 8bdb1c5206
commit dea48a289d
18 changed files with 316 additions and 43 deletions
--- a/include/Nazara/Math/Algorithm.inl
+++ b/include/Nazara/Math/Algorithm.inl
@@ -6,6 +6,7 @@
 #include <Nazara/Core/String.hpp>
 #include <Nazara/Math/Config.hpp>
 #include <algorithm>
+#include <cstdlib>
 #include <cstring>
 #include <type_traits>
 #include <Nazara/Core/Debug.hpp>