projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 634b38f c929ee2)
Merge zizzer.eecs.umich.edu:/z/m5/Bitkeeper/m5
authorSteve Reinhardt <stever@eecs.umich.edu>
Sat, 19 Mar 2005 13:47:19 +0000 (08:47 -0500)
committerSteve Reinhardt <stever@eecs.umich.edu>
Sat, 19 Mar 2005 13:47:19 +0000 (08:47 -0500)
into zizzer.eecs.umich.edu:/z/stever/bk/m5-head

--HG--
extra : convert_revision : a1cca61433e2cc9fd99d1a2361d32ea5c91b09c7

1  2 
python/m5/config.py patch | diff1 | diff2 | blob | history

diff --cc python/m5/config.py
Simple merge