Bobby R. Bruce has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/43203 )
Change subject: misc: Merge branch v20.1.0.5 hotfix into
release-staging-v21-0
......................................................................
misc: Merge branch v20.1.0.5 hotfix into release-staging-v21-0
Change-Id: I7383ae1c9870b2f4929601305158030ec3423302
---
M SConstruct
M src/Doxyfile
M src/base/version.cc
4 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/SConstruct b/SConstruct
index 2dbe8e3..fb3421c 100755
--- a/SConstruct
+++ b/SConstruct
@@ -133,14 +133,10 @@
#
########################################################################
-<<<<<<< HEAD (68d612 base-stats: Fix Watt Unit)
main = Environment(tools=['default', 'git', TempFileSpawn])
main.Tool(SCons.Tool.FindTool(['gcc', 'clang'], main))
main.Tool(SCons.Tool.FindTool(['g++', 'clang++'], main))
-=======
-main = Environment(tools=['default', 'git'])
->>>>>>> BRANCH (31cd81 misc: Updated the RELEASE-NOTES and version number)
from gem5_scons.util import get_termcap
termcap = get_termcap()
diff --git a/src/Doxyfile b/src/Doxyfile
index 99dd40b..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 (68d612 base-stats: Fix Watt Unit)
PROJECT_NUMBER = DEVELOP-FOR-V20.2
-=======
-PROJECT_NUMBER = v20.1.0.5
->>>>>>> BRANCH (31cd81 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 247b783..cfa98f9 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -29,8 +29,4 @@
/**
* @ingroup api_base_utils
*/
-<<<<<<< HEAD (68d612 base-stats: Fix Watt Unit)
const char *gem5Version = "[DEVELOP-FOR-V20.2]";
-=======
-const char *gem5Version = "20.1.0.5";
->>>>>>> BRANCH (31cd81 misc: Updated the RELEASE-NOTES and version number)
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/43203
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v21-0
Gerrit-Change-Id: I7383ae1c9870b2f4929601305158030ec3423302
Gerrit-Change-Number: 43203
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
