summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2019-08-13 22:11:06 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2019-08-13 22:11:06 +0300
commit9d069f5cc90d45dfe903126e2add4242c0992066 (patch)
tree556212ada9a38c86bf685a2b2a39cc2889f10744
parent26a2e4ba1e69fafac350ae2f1dd9be2ad8f4c0f6 (diff)
parente9ead7cc2ee9970b468ef6de0ba57726bb203ef4 (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 c5d9c8f7f5..a62c0bddfb 100755
--- a/.hgtags
+++ b/.hgtags
@@ -550,3 +550,4 @@ a3143db58a0f6b005232bf9018e7fef17ff9ec90 6.1.0-release
706bdc7e25c6e6b8fb56f4a13fcce2936e70a79c 6.2.1-release
ec09daf1899c1c01c4ba0ba950fae572f2a612a8 6.2.2-release
ab2ec5c5423b277d23fd0511ce50c15123ff2e03 6.2.3-release
+67297f9902857e357570c44722ad84de3aff974e 6.2.4-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 42cc526d6c..a6534bb333 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-6.2.4
+6.2.5