projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e4acb8 e1b8e71)
Merge zizzer:/bk/newmem
authorAli Saidi <saidi@eecs.umich.edu>
Thu, 13 Jul 2006 19:50:09 +0000 (15:50 -0400)
committerAli Saidi <saidi@eecs.umich.edu>
Thu, 13 Jul 2006 19:50:09 +0000 (15:50 -0400)
into  zeep.pool:/z/saidi/work/m5.newmem

src/python/m5/main.py:
    merge two help fixes

--HG--
extra : convert_revision : b5c4a88bb84b726bebd3e357a4ef29acc0d95600


Trivial merge