summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-12-14 00:42:13 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-12-14 00:42:13 +0200
commit2d94edf250895c52981b33f44b3a2b6ff2ba302d (patch)
tree18f7fc000f3fd10a350eb2312adf5251ebdf37fd
parent5111e0c921d17b83b41aef02b6334a8361ce1181 (diff)
parenta3b3ad727f53aa280ffbcc1b61ccfbb48e988708 (diff)
Merged in lindenlab/viewer-lynx
-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 e3735b444d..105abb4fa5 100755
--- a/.hgtags
+++ b/.hgtags
@@ -542,3 +542,4 @@ ac3b1332ad4f55b7182a8cbcc1254535a0069f75 5.1.7-release
23ea0fe36fadf009a60c080392ce80e4bf8af8d9 5.1.8-release
52422540bfe54b71155aa455360bee6e3ef1fd96 5.1.9-release
821edfcd14919c0e95c590866171c61fb57e8623 6.0.0-release
+21b7604680ef6b6ea67f8bebaaa588d6e263bdc1 6.0.1-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 5fe6072304..9b9a244206 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.0.1
+6.0.2