Fixed merge · dd02a9afd0 - Gogs

Fixed merge

Christophe Riccio 14 years ago

parent

0add256545 620861973e

commit

dd02a9afd0

1 changed files with 0 additions and 1 deletions

Unified View Show Diff Stats

						
							+ 0
							
							- 1
						
glm/core/_detail.hpp
							 
								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))