summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-04-19 22:19:00 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-04-19 22:19:00 +0300
commit81b1bad2610154c0c5d8bdf6a6a82d9e2f4d1b92 (patch)
treef762df014621e5f533f58387372d98b82c04bf8e
parentd7bc803af87ee6ae12457283784eb249b55a3fe2 (diff)
parentf62b5503285d828813d87779fa0658ee5f122ac5 (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 47413e0553..a832521ac3 100755
--- a/.hgtags
+++ b/.hgtags
@@ -525,3 +525,4 @@ b41e1e7c7876f7656c505f552b5888b4e478f92b 5.0.0-release
c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release
cea1632c002c065985ebea15eeeb4aac90f50545 5.0.2-release
02c24e9f4f7d8aa0de75f27817dda098582f4936 5.0.3-release
+022709ef76a331cac1ba6ef1a6da8a5e9ef63f5a 5.0.4-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 2d6c0bcf19..ab0fa336dd 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-5.0.4
+5.0.5