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

@@ -7,7 +7,7 @@
#ifndef NAZARA_PHYSWORLD_HPP
#define NAZARA_PHYSWORLD_HPP
#include <Nazara/Prerequesites.hpp>
#include <Nazara/Prerequisites.hpp>
#include <Nazara/Core/String.hpp>
#include <Nazara/Math/Vector3.hpp>
#include <Nazara/Physics3D/Config.hpp>