Merge branch 'master' into vulkan

2017-07-04 22:41:29 +02:00
parent 5f7f850d05 67dbb9e7c8
commit 9944a228b5
839 changed files with 12369 additions and 5421 deletions
--- a/include/Nazara/Renderer/Renderer.hpp
+++ b/include/Nazara/Renderer/Renderer.hpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2016 Jérôme Leclercq
+// Copyright (C) 2017 Jérôme Leclercq
 // This file is part of the "Nazara Engine - Renderer module"
 // For conditions of distribution and use, see copyright notice in Config.hpp

@@ -23,7 +23,7 @@ namespace Nz
 		public:
 			Renderer() = delete;
 			~Renderer() = delete;
-			
+
 			static inline RendererImpl* GetRendererImpl();

 			static bool Initialize();