projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f06d508 07e679f)
Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Thu, 15 Jun 2006 19:05:26 +0000 (15:05 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Thu, 15 Jun 2006 19:05:26 +0000 (15:05 -0400)
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : 45677638b0bb5753f3277c212094cfb9313d4706

1  2 
src/sim/main.cc patch | diff1 | diff2 | blob | history

diff --cc src/sim/main.cc
Simple merge