diff options
| author | Rider Linden <rider@lindenlab.com> | 2018-01-24 17:31:07 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2018-01-24 17:31:07 -0800 |
| commit | 9b05a8d1cde1d54e60bf4ead021372427c7d11fd (patch) | |
| tree | 84ad9b6bd36d5663cea5cd727b58c2eb78e79258 | |
| parent | b4af7fe9d03b7a8a9999dcfec3ad85304faf5268 (diff) | |
| parent | 7acbd8ed8d73c507675d45360df07d232c431a8b (diff) | |
Merge
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rwxr-xr-x | BuildParams | 2 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
3 files changed, 3 insertions, 2 deletions
@@ -531,3 +531,4 @@ b4d76b5590fdf8bab72c64442353753a527cbc44 5.0.5-release abcab37e1b29414ab8c03af9ca2ab489d809788a 5.0.7-release 505a492f30bd925bb48e2e093ae77c3c2b4c740f 5.0.8-release 40ca7118765be85a043b31b011e4ee6bd9e33c95 5.0.9-release +ad0e15543836d64d6399d28b32852510435e344a 5.1.0-release diff --git a/BuildParams b/BuildParams index a5edfadbd6..cb908f1532 100755 --- a/BuildParams +++ b/BuildParams @@ -14,7 +14,7 @@ build_docs = true build_Linux_Doxygen = true # Need viewer-build-variables as well as other shared repositories -buildscripts_shared_more_NAMEs="build_variables" +buildscripts_shared_more_NAMEs="build_secrets build_variables" ################################################################ #### Examples of how to set the viewer_channel #### diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 831446cbd2..ac14c3dfaa 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -5.1.0 +5.1.1 |