misc: Merge branch 'minor-release-staging-v21-0-1'

Change-Id: I4ac09b563094f5b375246ee87eca364e5b6e131b
2021-06-23 11:29:56 -07:00
parent c05e086814 a85e48ceb7
commit b69f97edc3
5 changed files with 28 additions and 4 deletions
--- a/src/Doxyfile
+++ b/src/Doxyfile
@@ -31,7 +31,7 @@ PROJECT_NAME           = gem5
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.

-PROJECT_NUMBER         = DEVELOP-FOR-V21.1
+PROJECT_NUMBER         = v21.0.1.0

 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -29,4 +29,5 @@
 /**
 * @ingroup api_base_utils
 */
-const char *gem5Version = "[DEVELOP-FOR-V21.1]";
+const char *gem5Version = "21.0.1.0";
+