Commit 8bedc6e5 authored by Florian Oetke's avatar Florian Oetke
Browse files

Merge branch 'develop' of...

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/dependencies/cpp/mirrage into develop
parents 3b8657af 97756e08
Pipeline #2717 passed with stage
in 13 minutes and 26 seconds
#include <sf2/sf2.hpp>
#include <mirrage/gui/gui.hpp> #include <mirrage/gui/gui.hpp>
#include <mirrage/asset/asset_manager.hpp> #include <mirrage/asset/asset_manager.hpp>
...@@ -9,7 +10,6 @@ ...@@ -9,7 +10,6 @@
#include <imgui.h> #include <imgui.h>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/gtx/transform.hpp> #include <glm/gtx/transform.hpp>
#include <sf2/sf2.hpp>
#include <cstdint> #include <cstdint>
#include <string> #include <string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment