Merge remote-tracking branch 'origin/master' into Font-Update

Former-commit-id: ae0244334123a3442c7675df80b1a501a6837257
2014-12-17 14:00:20 +01:00
parent 7316cbb694 e55c521e96
commit 528969d0fa
28 changed files with 652 additions and 64 deletions
--- a/include/Nazara/Renderer/RenderTarget.hpp
+++ b/include/Nazara/Renderer/RenderTarget.hpp
@@ -61,7 +61,7 @@ class NAZARA_API NzRenderTarget

 	private:
 		mutable std::unordered_map<Listener*, void*> m_listeners;
-		        bool m_listenersLocked;
+		bool m_listenersLocked;
 };

 #endif // NAZARA_RENDERTARGET_HPP