Fixed merge

This commit is contained in:
Christophe Riccio 2011-10-13 18:44:16 +01:00
commit dd02a9afd0

View File

@ -431,7 +431,6 @@ namespace detail
}; };
}//namespace detail }//namespace detail
}//namespace glm }//namespace glm
#if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2005)) #if((GLM_COMPILER & GLM_COMPILER_VC) && (GLM_COMPILER >= GLM_COMPILER_VC2005))