[Commits] Rev 3604: merge 5.2 in file:///H:/bzr/5.3/

Vladislav Vaintroub wlad at montyprogram.com
Thu Nov 22 19:31:45 EET 2012


At file:///H:/bzr/5.3/

------------------------------------------------------------
revno: 3604 [merge]
revision-id: wlad at montyprogram.com-20121122173109-ebvfi0bgcpsnjr4r
parent: sergii at pisem.net-20121117155015-4ab41ncach4iavao
parent: wlad at montyprogram.com-20121122172953-8w0dpm0k5k4pkuly
committer: Vladislav Vaintroub <wlad at montyprogram.com>
branch nick: 5.3
timestamp: Thu 2012-11-22 18:31:09 +0100
message:
  merge 5.2
modified:
  plugin/feedback/utils.cc       utils.cc-20111001192155-ovlxw2bsz88kc0sq-9
-------------- next part --------------
=== modified file 'plugin/feedback/utils.cc'
--- a/plugin/feedback/utils.cc	2011-11-12 15:41:00 +0000
+++ b/plugin/feedback/utils.cc	2012-11-22 17:27:02 +0000
@@ -44,6 +44,12 @@
   DWORD major = ver->dwMajorVersion;
   DWORD minor = ver->dwMinorVersion;
 
+  if (major == 6 && minor == 2)
+  {
+    return (ver->wProductType == VER_NT_WORKSTATION)?
+      "Windows 8":"Windows Server 2012";    
+  }
+  
   if (major == 6 && minor == 1)
   {
     return (ver->wProductType == VER_NT_WORKSTATION)?



More information about the commits mailing list