Merge branch 'master' into NDK

Conflicts:
	include/Nazara/Core/ConditionVariable.hpp

Former-commit-id: 84320f0a55ae9d8f80ff5211d30d99184c7b4213

include/Nazara/Core/ConditionVariable.hpp

@@ -8,11 +8,12 @@
 #define NAZARA_CONDITIONVARIABLE_HPP
 
 #include <Nazara/Prerequesites.hpp>
+#include <Nazara/Core/NonCopyable.hpp>
 
 class NzConditionVariableImpl;
 class NzMutex;
 
-class NAZARA_CORE_API NzConditionVariable
+class NAZARA_CORE_API NzConditionVariable : NzNonCopyable
 {
 	public:
 		NzConditionVariable();

include/Nazara/Core/File.hpp

@@ -23,6 +23,8 @@
 	#include <Nazara/Core/ThreadSafetyOff.hpp>
 #endif
 
+#include <ctime>
+
 class NzFileImpl;
 
 class NAZARA_CORE_API NzFile : public NzHashable, public NzInputStream, NzNonCopyable

include/Nazara/Core/HardwareInfo.hpp

@@ -20,6 +20,7 @@ class NAZARA_CORE_API NzHardwareInfo
 		static unsigned int GetProcessorCount();
 		static nzProcessorVendor GetProcessorVendor();
 		static NzString GetProcessorVendorName();
+		static nzUInt64 GetTotalMemory();
 
 		static bool HasCapability(nzProcessorCap capability);
 

include/Nazara/Core/Mutex.hpp

@@ -21,7 +21,9 @@ class NAZARA_CORE_API NzMutex : NzNonCopyable
 		~NzMutex();
 
 		void Lock();
+
 		bool TryLock();
+
 		void Unlock();
 
 	private:

include/Nazara/Core/Semaphore.hpp

@@ -19,7 +19,9 @@ class NAZARA_CORE_API NzSemaphore : NzNonCopyable
 		~NzSemaphore();
 
 		unsigned int GetCount() const;
+
 		void Post();
+
 		void Wait();
 		bool Wait(nzUInt32 timeout);