Fixed merge

2013-09-17 23:30:37 +02:00
parent da67a79222 579ab2b7d2
commit 52d86dcc19
2 changed files with 6 additions and 2 deletions
--- a/test/core/core_setup_message.cpp
+++ b/test/core/core_setup_message.cpp
@@ -36,6 +36,9 @@ int test_compiler()
 		case GLM_COMPILER_VC12:
 			std::cout << "GLM_COMPILER_VC12" << std::endl;
 			break;
+		case GLM_COMPILER_VC2013:
+			std::cout << "GLM_COMPILER_VC2013" << std::endl;
+			break;
 		default:
 			std::cout << "Visual C++ version not detected" << std::endl;
 			Error += 1;