Fixed merge

This commit is contained in:
Christophe Riccio 2011-09-13 13:35:05 +01:00
commit 6628d62ce6

View File

@ -1415,6 +1415,7 @@ namespace detail
}
GLM_FUNC_QUALIFIER detail::tvec2<float> intBitsToFloat
(
detail::tvec2<int> const & value
)