projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 29f50d9 70b35ba)
Merge ktlim@zizzer:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Mon, 27 Feb 2006 17:09:08 +0000 (12:09 -0500)
committerKevin Lim <ktlim@umich.edu>
Mon, 27 Feb 2006 17:09:08 +0000 (12:09 -0500)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/m5-clean

--HG--
extra : convert_revision : 97c345f0715a347ce34f9cabd994485f30f2e171

1  2 
dev/sinic.cc patch | diff1 | diff2 | blob | history

diff --cc dev/sinic.cc
Simple merge