Merge branch 'master' into console-widget

2018-04-12 12:47:17 +02:00
parent cd332c79ad 2f2b1f101b
commit 16014d3f37
1058 changed files with 145127 additions and 7192 deletions
--- a/SDK/include/NDK/Application.inl
+++ b/SDK/include/NDK/Application.inl
@@ -1,10 +1,8 @@
 // Copyright (C) 2017 Jérôme Leclercq
 // This file is part of the "Nazara Development Kit"
-// For conditions of distribution and use, see copyright notice in Prerequesites.hpp
+// For conditions of distribution and use, see copyright notice in Prerequisites.hpp

-#include <NDK/Application.hpp>
 #include <Nazara/Core/ErrorFlags.hpp>
-#include <type_traits>
 #include <NDK/Sdk.hpp>

 namespace Ndk