Changeset 51e40030


Ignore:
Timestamp:
Dec 14, 2011 3:59:19 AM (9 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
212981d, 7864404
Parents:
6da32a1 (diff), 5673a65 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

merge of 'db5a04b2f4ebd4869d162a3bfa48221dec583b7e'

and 'e82c7db57396b2f2057f46c000a688200c4d12ea'

Files:
5 edited

Legend:

Unmodified
Added
Removed
  • build.properties

    r6da32a1 r51e40030  
    1010# Javadocs
    1111# Note: Include the trailing slash! Don't surround the URL in quotes!
    12 javasedocs.url=http://download.oracle.com/javase/6/docs/api/
     12javasedocs.url=http://docs.oracle.com/javase/6/docs/api/
    1313jettydocs.url=http://docs.i2p2.de/jetty/javadoc/
    1414jrobindocs.url=http://docs.i2p-projekt.de/jrobin/javadoc/
  • core/java/src/freenet/support/CPUInformation/AMDCPUInfo.java

    r6da32a1 r51e40030  
    11/*
    22 * Created on Jul 17, 2004
    3  *
    4  */
    5 package freenet.support.CPUInformation;
    6 
    7 /**
    8  * @author Iakin
    9  * An interface for classes that provide lowlevel information about AMD CPU's
    103 *
    114 * free (adj.): unencumbered; not under the control of others
     
    147 * It probably won't make your computer catch on fire, or eat
    158 * your children, but it might. Use at your own risk.
     9 */
     10package freenet.support.CPUInformation;
     11
     12/**
     13 * An interface for classes that provide lowlevel information about AMD CPU's
     14 *
     15 * @author Iakin
    1616 */
    1717public interface AMDCPUInfo extends CPUInfo {
  • core/java/src/freenet/support/CPUInformation/CPUID.java

    r6da32a1 r51e40030  
    22 * Created on Jul 14, 2004
    33 * Updated on Jan 8, 2011
     4 *
     5 * free (adj.): unencumbered; not under the control of others
     6 * Written by Iakin in 2004 and released into the public domain
     7 * with no warranty of any kind, either expressed or implied.
     8 * It probably won't make your computer catch on fire, or eat
     9 * your children, but it might. Use at your own risk.
    410 */
    511package freenet.support.CPUInformation;
     
    1824
    1925/**
    20  * @author Iakin
    2126 * A class for retrieveing details about the CPU using the CPUID assembly instruction.
    2227 * A good resource for information about the CPUID instruction can be found here:
    2328 * http://www.paradicesoftware.com/specs/cpuid/index.htm
    2429 *
    25  * free (adj.): unencumbered; not under the control of others
    26  * Written by Iakin in 2004 and released into the public domain
    27  * with no warranty of any kind, either expressed or implied.
    28  * It probably won't make your computer catch on fire, or eat
    29  * your children, but it might. Use at your own risk.
     30 * @author Iakin
    3031*/
    3132
  • core/java/src/freenet/support/CPUInformation/CPUInfo.java

    r6da32a1 r51e40030  
    22 * Created on Jul 14, 2004
    33 * Updated on Jan 8, 2011
    4  */
    5 package freenet.support.CPUInformation;
    6 
    7 /**
    8  * @author Iakin
    9  * An interface for classes that provide lowlevel information about CPU's
    104 *
    115 * free (adj.): unencumbered; not under the control of others
     
    148 * It probably won't make your computer catch on fire, or eat
    159 * your children, but it might. Use at your own risk.
     10 */
     11package freenet.support.CPUInformation;
     12
     13/**
     14 * An interface for classes that provide lowlevel information about CPU's
     15 *
     16 * @author Iakin
    1617 */
    1718
  • core/java/src/freenet/support/CPUInformation/IntelCPUInfo.java

    r6da32a1 r51e40030  
    11/*
    22 * Created on Jul 17, 2004
    3  *
    4  */
    5 package freenet.support.CPUInformation;
    6 
    7 /**
    8  * @author Iakin
    9  * An interface for classes that provide lowlevel information about Intel CPU's
    103 *
    114 * free (adj.): unencumbered; not under the control of others
     
    147 * It probably won't make your computer catch on fire, or eat
    158 * your children, but it might. Use at your own risk.
     9 */
     10package freenet.support.CPUInformation;
     11
     12/**
     13 * An interface for classes that provide lowlevel information about Intel CPU's
     14 *
     15 * @author Iakin
    1616 */
    1717public interface IntelCPUInfo extends CPUInfo {
Note: See TracChangeset for help on using the changeset viewer.