From ba1ccbaba214df7c4b065cfaf2238395864321d3 Mon Sep 17 00:00:00 2001
From: Christophe Riccio <mail@g-truc.net>
Date: Sun, 15 Sep 2013 03:57:12 +0200
Subject: [PATCH] Fixed merge

---
 glm/gtx/rotate_vector.inl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/glm/gtx/rotate_vector.inl b/glm/gtx/rotate_vector.inl
index 53929cc2..bbec1e20 100644
--- a/glm/gtx/rotate_vector.inl
+++ b/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