sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into Font-Update

Browse Source 
Former-commit-id: 7b46087b9e3c137ca1e036449edae7ef15a99f7a
This commit is contained in:
Lynix
2015-01-03 22:17:40 +01:00
parent 528969d0fa 57b90112fb
commit 5b0d65c767
2 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Nazara/Core/Resource.cpp
View File

@@ -6,9 +6,6 @@
#include <Nazara/Core/Config.hpp>
#include <Nazara/Core/Error.hpp>
#include <Nazara/Core/ResourceListener.hpp>
#include <Nazara/Utility/StaticMesh.hpp>
#include <Nazara/Utility/VertexDeclaration.hpp>
#include <typeinfo>
#if NAZARA_CORE_THREADSAFE && NAZARA_THREADSAFETY_RESOURCE
#include <Nazara/Core/ThreadSafety.hpp>