# HG changeset patch
# User kmo
# Date 1363303078 25200
# Node ID 43372abd0c17b3d99f9605767c1b633af1ea92d5
# Parent  eadc31b7dd026a635dffd31f0eaead6274d78a2e# Parent  ebf30634b326265cc2b03de9cbad9329d81cba96
Merge

diff -r eadc31b7dd02 -r 43372abd0c17 hotspot/src/share/vm/runtime/vm_version.cpp
--- a/hotspot/src/share/vm/runtime/vm_version.cpp	Thu Mar 14 07:44:18 2013 -0700
+++ b/hotspot/src/share/vm/runtime/vm_version.cpp	Thu Mar 14 16:17:58 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