Lynix dea48a289d Merge branch 'master' into NDK ... Conflicts: include/Nazara/Core/ConditionVariable.hpp Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213		2015-08-21 12:49:05 +02:00
..
Nazara	Merge branch 'master' into NDK	2015-08-21 12:49:05 +02:00