projects / gem5.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9a01d3e 0d70304)
misc: Merge branch hotfix v20.1.0.2 branch into develop
authorBobby R. Bruce <bbruce@ucdavis.edu>
Mon, 16 Nov 2020 19:25:23 +0000 (11:25 -0800)
committerBobby R. Bruce <bbruce@ucdavis.edu>
Mon, 16 Nov 2020 19:25:23 +0000 (11:25 -0800)
This merge commit also reverts the version info back to
'DEVELOP-FOR-V20.2' for the develop branch.

Change-Id: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6


Trivial merge