Merge branch 'master' into physics3d-material

This commit is contained in:
Lynix
2018-01-17 18:25:57 +01:00
410 changed files with 544 additions and 492 deletions

View File

@@ -1,6 +1,6 @@
// 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 <Nazara/Core/Error.hpp>
#include "PhysicsComponent3D.hpp"