projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d77d39d 4a5b51b)
Merge ktlim@zizzer:/bk/newmem
authorKevin Lim <ktlim@umich.edu>
Wed, 31 May 2006 15:34:42 +0000 (11:34 -0400)
committerKevin Lim <ktlim@umich.edu>
Wed, 31 May 2006 15:34:42 +0000 (11:34 -0400)
into  zamp.eecs.umich.edu:/z/ktlim2/clean/newmem

--HG--
extra : convert_revision : 3d951bbeee0178de47e1bdbe704808544bfe732e

1  2 
SConstruct patch | diff1 | diff2 | blob | history
src/SConscript patch | diff1 | diff2 | blob | history

diff --cc SConstruct
Simple merge
diff --cc src/SConscript
Simple merge