projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35082a6 db40cb8)
Automated merge with ssh://hg@m5sim.org/m5
authorDerek Hower <drh5@cs.wisc.edu>
Thu, 13 Aug 2009 15:37:37 +0000 (10:37 -0500)
committerDerek Hower <drh5@cs.wisc.edu>
Thu, 13 Aug 2009 15:37:37 +0000 (10:37 -0500)
1  2 
src/mem/ruby/config/cfg.rb patch | diff1 | diff2 | blob | history

diff --cc src/mem/ruby/config/cfg.rb
Simple merge