From: Bobby R. Bruce <bbruce@ucdavis.edu>
Date: Tue, 2 Jun 2020 09:17:29 +0000 (-0700)
Subject: misc: Reverted version information to "develop"
X-Git-Tag: v20.1.0.0~599
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c1bf5469d8bea3df1d4fd93466dc012dd40a7f23;p=gem5.git

misc: Reverted version information to "develop"

Change-Id: I6ee1bae48f2dd0d868dfbb428e93deeb9ee93083
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/29833
Reviewed-by: Bobby R. Bruce <bbruce@ucdavis.edu>
Maintainer: Bobby R. Bruce <bbruce@ucdavis.edu>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/ext/testlib/configuration.py b/ext/testlib/configuration.py
index 04744e113..b7c4697fb 100644
--- a/ext/testlib/configuration.py
+++ b/ext/testlib/configuration.py
@@ -221,7 +221,7 @@ def define_defaults(defaults):
                                                       os.pardir))
     defaults.result_path = os.path.join(os.getcwd(), '.testing-results')
     defaults.list_only_failed = False
-    defaults.resource_url = 'http://dist.gem5.org/dist/v20'
+    defaults.resource_url = 'http://dist.gem5.org/dist/develop'
 
 def define_constants(constants):
     '''
diff --git a/src/Doxyfile b/src/Doxyfile
index cd1a9474e..c92a787b6 100644
--- 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         = v20.0.0.2
+PROJECT_NUMBER         = DEVELOP-FOR-V20.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 7e89b992e..4419aa53a 100644
--- a/src/base/version.cc
+++ b/src/base/version.cc
@@ -26,4 +26,4 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-const char *gem5Version = "20.0.0.2";
+const char *gem5Version = "[DEVELOP-FOR-V20.1]";