Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/50107 )
Change subject: misc: Merge branch v21.1.0.1 into develop
......................................................................
misc: Merge branch v21.1.0.1 into develop
Change-Id: Ia1df6f9bce23633a2fef5c818d26a043f8d8e39d
---
M src/Doxyfile
M src/base/version.cc
3 files changed, 0 insertions(+), 8 deletions(-)
diff --git a/src/Doxyfile b/src/Doxyfile
index 9b2145c..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 (cd27e4 arch-arm: Eliminate the INTREG_DUMMY integer
register.)
PROJECT_NUMBER = DEVELOP-FOR-V21-2
-=======
-PROJECT_NUMBER = v21.1.0.1
->>>>>>> BRANCH (082f08 misc: Update the version to v21.1.0.1)
# 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 fd2fda7..078a2f9 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -32,10 +32,6 @@
/**
* @ingroup api_base_utils
*/
-<<<<<<< HEAD (cd27e4 arch-arm: Eliminate the INTREG_DUMMY integer
register.)
const char *gem5Version = "[DEVELOP-FOR-V21.2]";
-=======
-const char *gem5Version = "21.1.0.1";
->>>>>>> BRANCH (082f08 misc: Update the version to v21.1.0.1)
} // namespace gem5
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/50107
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: Ia1df6f9bce23633a2fef5c818d26a043f8d8e39d
Gerrit-Change-Number: 50107
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
