From 562cabfbd66d06ca613f380f5cbaa448e075f649 Mon Sep 17 00:00:00 2001 From: dev Date: Thu, 9 Jun 2011 13:03:46 +0000 Subject: [PATCH] Fixed bad merge, re-added CPU flags hex output. --- core/java/src/freenet/support/CPUInformation/CPUID.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/java/src/freenet/support/CPUInformation/CPUID.java b/core/java/src/freenet/support/CPUInformation/CPUID.java index 598a4e4e6d..bdff4588da 100644 --- a/core/java/src/freenet/support/CPUInformation/CPUID.java +++ b/core/java/src/freenet/support/CPUInformation/CPUID.java @@ -866,7 +866,7 @@ public class CPUID { System.out.println("CPU Family: " + getCPUFamily()); System.out.println("CPU Model: " + getCPUModel()); System.out.println("CPU Stepping: " + getCPUStepping()); - System.out.println("CPU Flags: " + getEDXCPUFlags()); + System.out.println("CPU Flags: 0x" + Integer.toHexString(getEDXCPUFlags())); CPUInfo c = getInfo(); System.out.println(" **More CPUInfo**");