Fixed bad merge, re-added CPU flags hex output.

2011-06-09 13:03:46 +00:00
parent 4033361f10
commit 562cabfbd6
1 changed files with 1 additions and 1 deletions
--- 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**");