# HG changeset patch
# User morris
# Date 1363398248 25200
# Node ID 412be73af45111fdd32b5aa33705875f1339f31c
# Parent  bd0382b965c954f745f385a38ab0811c4d0c043a# Parent  43372abd0c17b3d99f9605767c1b633af1ea92d5
Merge

diff -r bd0382b965c9 -r 412be73af451 hotspot/src/share/vm/runtime/vm_version.cpp
--- a/hotspot/src/share/vm/runtime/vm_version.cpp	Fri Mar 15 11:44:33 2013 -0700
+++ b/hotspot/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