projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d191b14 4b69deb)
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
authorSteve Reinhardt <stever@eecs.umich.edu>
Wed, 9 Mar 2005 05:17:20 +0000 (00:17 -0500)
committerSteve Reinhardt <stever@eecs.umich.edu>
Wed, 9 Mar 2005 05:17:20 +0000 (00:17 -0500)
into zizzer.eecs.umich.edu:/z/stever/bk/m5-head

--HG--
extra : convert_revision : daaeb6a596b08fbedd6a14833dcb3825c637d486

1  2 
sim/pyconfig/m5config.py patch | diff1 | diff2 | blob | history

diff --cc sim/pyconfig/m5config.py
Simple merge