projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b1fc43d d96d28e)
Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Sat, 17 Jun 2006 21:17:43 +0000 (17:17 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Sat, 17 Jun 2006 21:17:43 +0000 (17:17 -0400)
into  zeep.eecs.umich.edu:/z/saidi/work/m5.newmem

--HG--
extra : convert_revision : c8670f1a39d6826870ca0934587f4cc71c94b0ab

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

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