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/Core/Mutex.hpp
+++ b/include/Nazara/Core/Mutex.hpp
@@ -21,7 +21,9 @@ class NAZARA_CORE_API NzMutex : NzNonCopyable
 		~NzMutex();

 		void Lock();
+
 		bool TryLock();
+
 		void Unlock();

 	private: