summaryrefslogtreecommitdiff
path: root/indra/llcommon/llfasttimer.h
diff options
context:
space:
mode:
authorAaron Brashears <aaronb@lindenlab.com>2007-10-04 16:31:48 +0000
committerAaron Brashears <aaronb@lindenlab.com>2007-10-04 16:31:48 +0000
commit4942a7b77917f9a163453ecdd040993965672cc0 (patch)
tree3dd01f5e182d2eea2e34528cebe749d948a477fc /indra/llcommon/llfasttimer.h
parent9fc7049151a16e3722c6ce90899e3c7b63161615 (diff)
Result of svn merge -r70873:71086 svn+ssh://svn/svn/linden/branches/enable-exceptions into release.
Diffstat (limited to 'indra/llcommon/llfasttimer.h')
-rw-r--r--indra/llcommon/llfasttimer.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/indra/llcommon/llfasttimer.h b/indra/llcommon/llfasttimer.h
index 3e88784d3c..648c4bab4e 100644
--- a/indra/llcommon/llfasttimer.h
+++ b/indra/llcommon/llfasttimer.h
@@ -9,8 +9,6 @@
#ifndef LL_LLFASTTIMER_H
#define LL_LLFASTTIMER_H
-#include "lltimer.h"
-
#define FAST_TIMER_ON 1
U64 get_cpu_clock_count();