Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/50828 )
Change subject: misc: Merge branch v21.1.0.2 hotfix branch into develop
......................................................................
misc: Merge branch v21.1.0.2 hotfix branch into develop
Change-Id: I225dddd6ec1399528f4759a3c5c5e306d8c7a38c
---
M src/Doxyfile
M src/base/version.cc
3 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/Doxyfile b/src/Doxyfile
index b9ea15a..dd52c25 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 (c10982 tests: Update x86 boot tests to use x86-ubuntu-img)
PROJECT_NUMBER = DEVELOP-FOR-V21-2
-=======
-PROJECT_NUMBER = v21.1.0.2
->>>>>>> BRANCH (4666a4 misc: Update RELEASE-NOTES.md for v21.1.0.2)
# 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 84c86ce..078a2f9 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -32,10 +32,6 @@
/**
* @ingroup api_base_utils
*/
-<<<<<<< HEAD (c10982 tests: Update x86 boot tests to use x86-ubuntu-img)
const char *gem5Version = "[DEVELOP-FOR-V21.2]";
-=======
-const char *gem5Version = "21.1.0.2";
->>>>>>> BRANCH (4666a4 misc: Update RELEASE-NOTES.md for v21.1.0.2)
} // namespace gem5
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/50828
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: I225dddd6ec1399528f4759a3c5c5e306d8c7a38c
Gerrit-Change-Number: 50828
Gerrit-PatchSet: 1
Gerrit-Owner: Bobby R. Bruce <[email protected]>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
