Fixed merge

This commit is contained in:
Christophe Riccio
2013-04-23 16:40:07 +02:00
parent 3c7989486e
commit 8c7828e6f7
12 changed files with 42 additions and 42 deletions

View File

@@ -339,7 +339,7 @@ namespace glm
return Result;
}
template <typename T, precision P, typename U>
template <typename T, typename U, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> project
(
detail::tvec3<T, P> const & obj,
@@ -360,7 +360,7 @@ namespace glm
return detail::tvec3<T, P>(tmp);
}
template <typename T, precision P, typename U>
template <typename T, typename U, precision P>
GLM_FUNC_QUALIFIER detail::tvec3<T, P> unProject
(
detail::tvec3<T, P> const & win,