summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-05-22 22:04:24 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-05-22 22:04:24 +0300
commitaa5b15c940615b52000846b6146f6c90faf480a8 (patch)
tree6b289ecbca0b7ac424e6fd1c5aa50c0cb46f2704
parentf0566985b872861414e2f13042b7cc743f967aea (diff)
parent2c0dfcdf49b9d44afb01c533a84eb9f7feea3e74 (diff)
Merged in lindenlab/viewer-bear
-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 a832521ac3..3f2adaf5dd 100755
--- a/.hgtags
+++ b/.hgtags
@@ -526,3 +526,4 @@ c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release
cea1632c002c065985ebea15eeeb4aac90f50545 5.0.2-release
02c24e9f4f7d8aa0de75f27817dda098582f4936 5.0.3-release
022709ef76a331cac1ba6ef1a6da8a5e9ef63f5a 5.0.4-release
+b4d76b5590fdf8bab72c64442353753a527cbc44 5.0.5-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index ab0fa336dd..c20c645d7e 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-5.0.5
+5.0.6