Merge branch '0.9.3' into 0.9.4
This commit is contained in:
2
test/external/gli/gtx/loader_tga.inl
vendored
2
test/external/gli/gtx/loader_tga.inl
vendored
@@ -156,4 +156,4 @@ namespace loader_tga
|
||||
}
|
||||
}//namespace loader_tga
|
||||
}//namespace gtx
|
||||
}//namespace gli
|
||||
}//namespace gli
|
||||
|
||||
@@ -7,7 +7,6 @@
|
||||
// File : test/gtx/string_cast.cpp
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
#define GLM_MESSAGES
|
||||
#include <glm/glm.hpp>
|
||||
#include <glm/gtx/string_cast.hpp>
|
||||
#include <iostream>
|
||||
|
||||
Reference in New Issue
Block a user