Conflicts: src/AbstractFramebuffer.h src/Context.cpp src/Context.h src/Framebuffer.h src/Math/Angle.h src/Math/Complex.h src/Math/Matrix3.h src/Math/Matrix4.h src/Math/Quaternion.h src/Math/RectangularMatrix.h src/Math/Unit.h src/Math/Vector.h src/Math/Vector2.h src/Math/Vector3.h src/Math/Vector4.h src/MeshTools/Clean.h src/Physics/AbstractShape.h src/Physics/Test/ShapeGroupTest.cpp src/Physics/Test/ShapeTestBase.h src/ResourceManager.h src/SceneGraph/DualComplexTransformation.h src/SceneGraph/DualQuaternionTransformation.h src/SceneGraph/FeatureGroup.h src/SceneGraph/MatrixTransformation2D.h src/SceneGraph/MatrixTransformation3D.h src/SceneGraph/Object.h src/SceneGraph/RigidMatrixTransformation2D.h src/SceneGraph/RigidMatrixTransformation3D.h