Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/37635 )
Change subject: misc: Merge branch hotfix v20.1.0.2 branch into develop
......................................................................
misc: Merge branch hotfix v20.1.0.2 branch into develop
This merge commit also reverts the version info back to
'DEVELOP-FOR-V20.2' for the develop branch.
Change-Id: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6
---
M src/Doxyfile
M src/base/version.cc
3 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/Doxyfile b/src/Doxyfile
index 497a781..d453314 100644
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -31,11 +31,7 @@
# This could be handy for archiving the generated documentation or
# if some version control system is used.
-<<<<<<< HEAD (9a01d3 dev-hsa,gpu-compute: Agent Packet handler
implemented.)
PROJECT_NUMBER = DEVELOP-FOR-V20.2
-=======
-PROJECT_NUMBER = v20.1.0.2
->>>>>>> BRANCH (0d7030 misc: Updated the RELEASE-NOTES and version number)
# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
# base path where the generated documentation will be put.
diff --git a/src/base/version.cc b/src/base/version.cc
index 0eb7507..cfa98f9 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -29,8 +29,4 @@
/**
* @ingroup api_base_utils
*/
-<<<<<<< HEAD (9a01d3 dev-hsa,gpu-compute: Agent Packet handler
implemented.)
const char *gem5Version = "[DEVELOP-FOR-V20.2]";
-=======
-const char *gem5Version = "20.1.0.2";
->>>>>>> BRANCH (0d7030 misc: Updated the RELEASE-NOTES and version number)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/37635
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: If6fd326cc23edf2aeaa67353d4d3fed573e9ddd6
Gerrit-Change-Number: 37635
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce <bbr...@ucdavis.edu>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
