diff options
author | max-001 <maxsmits21@kpnmail.nl> | 2024-11-05 16:34:00 +0100 |
---|---|---|
committer | max-001 <maxsmits21@kpnmail.nl> | 2024-11-05 16:34:00 +0100 |
commit | 3d27e696185d6f4dfc9e978517ed17844044c5bc (patch) | |
tree | af65fdcdb44a1f9e6a84a294f267e6f743fea599 /src/crepe/api/AssetManager.cpp | |
parent | 6071387c2bbe6d36a95c113ad137e8e2ce80be27 (diff) | |
parent | ae6a103946e437ca85cc69c5fc2cbf68d35ffeae (diff) |
Merge remote-tracking branch 'origin/max/gameobject' into max/scenes
Diffstat (limited to 'src/crepe/api/AssetManager.cpp')
-rw-r--r-- | src/crepe/api/AssetManager.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/crepe/api/AssetManager.cpp b/src/crepe/api/AssetManager.cpp index 560df6c..b891760 100644 --- a/src/crepe/api/AssetManager.cpp +++ b/src/crepe/api/AssetManager.cpp @@ -2,7 +2,7 @@ #include "AssetManager.h" -using namespace crepe::api; +using namespace crepe; AssetManager & AssetManager::get_instance() { static AssetManager instance; |