projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6ac7954 fa7fa5a)
Merge zizzer.eecs.umich.edu:/bk/m5
authorKevin Lim <ktlim@umich.edu>
Fri, 21 Jan 2005 23:31:30 +0000 (18:31 -0500)
committerKevin Lim <ktlim@umich.edu>
Fri, 21 Jan 2005 23:31:30 +0000 (18:31 -0500)
into zamp.eecs.umich.edu:/z/ktlim2/m5-patched/m5-new

--HG--
extra : convert_revision : e802c800a478c297d3aa780a9ea3c6701453d91d

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

diff --cc dev/ns_gige.hh
Simple merge
diff --cc dev/sinic.hh
Simple merge