projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c4714c d697721)
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Fri, 25 Feb 2005 23:01:19 +0000 (18:01 -0500)
committerKevin Lim <ktlim@umich.edu>
Fri, 25 Feb 2005 23:01:19 +0000 (18:01 -0500)
into zamp.eecs.umich.edu:/z/ktlim2/m5

--HG--
extra : convert_revision : ba556bbc93275fcd920a0529383fd480bb7218de

1  2 
arch/alpha/isa_traits.hh patch | diff1 | diff2 | blob | history
base/traceflags.py patch | diff1 | diff2 | blob | history

diff --cc arch/alpha/isa_traits.hh
Simple merge
diff --cc base/traceflags.py
Simple merge