summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-11-14 22:40:23 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-11-14 22:40:23 +0200
commit9839a68c5a0ceba42cbe2745b4c7ef279e32813f (patch)
tree6ab46fcfc8b44658f273e4336600e314f2c1506a
parent39652180aea043b4e8d0cb1f9a2a484e5ce2a471 (diff)
parent8558ce5c600b810356010ba3cd6d534ef22f4081 (diff)
Merged in lindenlab/viewer-release
-rwxr-xr-x.hgtags1
-rw-r--r--indra/newview/VIEWER_VERSION.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 06d289325d..e3735b444d 100755
--- a/.hgtags
+++ b/.hgtags
@@ -541,3 +541,4 @@ ad0e15543836d64d6399d28b32852510435e344a 5.1.0-release
ac3b1332ad4f55b7182a8cbcc1254535a0069f75 5.1.7-release
23ea0fe36fadf009a60c080392ce80e4bf8af8d9 5.1.8-release
52422540bfe54b71155aa455360bee6e3ef1fd96 5.1.9-release
+821edfcd14919c0e95c590866171c61fb57e8623 6.0.0-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 09b254e90c..5fe6072304 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.0.0
+6.0.1