Fixed merge

glm/gtx/rotate_vector.inl

@@ -204,7 +204,7 @@ namespace glm
 		if(all(equal(Normal, Up)))
 			return detail::tmat4x4<T, P>(T(1));
 
-		detail::tvec3<T> RotationAxis = cross(Up, Normal);
+		detail::tvec3<T, P> RotationAxis = cross(Up, Normal);
 #		ifdef GLM_FORCE_RADIANS
 			T Angle = acos(dot(Normal, Up));
 #		else