# HG changeset patch
# User morris
# Date 1363398248 25200
# Node ID f3d486462d36d78b71aba51dfe75b3bde4213a6b
# Parent  7ae04e71af90ae1adb13b5e38d1aa24104d263ac# Parent  a40807924950432d8c626bd67bfa6ca8a8e79094
Merge

diff -r 7ae04e71af90 -r f3d486462d36 src/share/vm/runtime/vm_version.cpp
--- a/src/share/vm/runtime/vm_version.cpp	Fri Mar 15 11:44:33 2013 -0700
+++ b/src/share/vm/runtime/vm_version.cpp	Fri Mar 15 18:44:08 2013 -0700
@@ -211,6 +211,10 @@
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 8.0 (VS2005)"
       #elif _MSC_VER == 1500
         #define HOTSPOT_BUILD_COMPILER "MS VC++ 9.0 (VS2008)"
+      #elif _MSC_VER == 1600
+        #define HOTSPOT_BUILD_COMPILER "MS VC++ 10.0 (VS2010)"
+      #elif _MSC_VER == 1700
+        #define HOTSPOT_BUILD_COMPILER "MS VC++ 11.0 (VS2012)"
       #else
         #define HOTSPOT_BUILD_COMPILER "unknown MS VC++:" XSTR(_MSC_VER)
       #endif