summaryrefslogtreecommitdiff
path: root/src/python/m5/internal/__init__.py
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2007-08-02 23:30:25 -0700
committerGabe Black <gblack@eecs.umich.edu>2007-08-02 23:30:25 -0700
commit121a894ce0d551e860392f9aa6bd381329a25b96 (patch)
tree3e8b7ded2869c14eb45403a15100d45d247f401b /src/python/m5/internal/__init__.py
parentf4b89cd897e15b34f1565f55d7c6ce0c056f361a (diff)
parent0536d0cde931e89d33b10228950d455dd54d8a5f (diff)
downloadgem5-121a894ce0d551e860392f9aa6bd381329a25b96.tar.xz
Merge with head.
--HG-- extra : convert_revision : c8b066289916b3fb24bcae1e9c76e27ad4cf61b1
Diffstat (limited to 'src/python/m5/internal/__init__.py')
-rw-r--r--src/python/m5/internal/__init__.py1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/python/m5/internal/__init__.py b/src/python/m5/internal/__init__.py
index 6b7859cd7..4aa76cca7 100644
--- a/src/python/m5/internal/__init__.py
+++ b/src/python/m5/internal/__init__.py
@@ -30,6 +30,5 @@ import core
import debug
import event
import random
-import sim_object
import stats
import trace