summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2006-02-12 12:17:51 -0500
committerGabe Black <gblack@eecs.umich.edu>2006-02-12 12:17:51 -0500
commit4d4c105ac58e8a033de3bb89de23d95cf2db44f8 (patch)
treec265cbe33edb4ec791bbe87bea94a78c6cfd173d
parent94590a4dba6712ae61bfed260d7933b58b78c449 (diff)
parent47a065d9f0dc25ece52ca3c4c6ab1a196bad6371 (diff)
downloadgem5-4d4c105ac58e8a033de3bb89de23d95cf2db44f8.tar.xz
Merge gblack@m5.eecs.umich.edu:/bk/multiarch
into ewok.(none):/home/gblack/m5/multiarch --HG-- extra : convert_revision : baf9b0eb84df7da8152ddf9a25264e041a24b8ca
-rw-r--r--sim/vptr.hh (renamed from arch/alpha/vptr.hh)0
1 files changed, 0 insertions, 0 deletions
diff --git a/arch/alpha/vptr.hh b/sim/vptr.hh
index d1bda4061..d1bda4061 100644
--- a/arch/alpha/vptr.hh
+++ b/sim/vptr.hh