Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 5563 in orxonox.OLD


Ignore:
Timestamp:
Nov 14, 2005, 8:27:39 PM (18 years ago)
Author:
hdavid
Message:

orxonox/branches/network: removed temporary timex.h in benchmark.cc. Know it runs on UBUNTU.

Location:
branches/network/src
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/network/src/Makefile.am

    r5561 r5563  
    7171                  world_entities/power_ups/turret_power_up.cc \
    7272                  world_entities/power_ups/laser_power_up.cc
    73 ##                  subprojects/benchmark.cc
     73                  subprojects/benchmark.cc
    7474
    7575noinst_HEADERS = orxonox.h ability.h defs/message_structures.h \

  • branches/network/src/orxonox.cc

    r5561 r5563  
    4646#include "fast_factory.h"
    4747
    48 //#include "benchmark.h"
     48#include "benchmark.h"
    4949
    5050#include "class_list.h"

  • branches/network/src/subprojects/benchmark.cc

    r5427 r5563  
    3636#include <stdlib.h>
    3737#include <asm/msr.h>
    38 #include <linux/timex.h>
     38//#include <linux/timex.h>
    3939
    4040
Note: See TracChangeset for help on using the changeset viewer.