summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2017-03-06 22:46:22 +0200
committerAndreyL ProductEngine <alihatskiy@productengine.com>2017-03-06 22:46:22 +0200
commitb4b639e443969065783bf34c3d85f959e52b5c0a (patch)
treed7e4c67f58d9eec985889b99edbd1bad6919c31f
parenta1bc791bf8a6a7a837c8c9c29455fbef5d2e36f9 (diff)
parent08ed7f676f2ce38937a03c2a4e823e3564981264 (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 797f517d84..c813f18b10 100755
--- a/.hgtags
+++ b/.hgtags
@@ -523,3 +523,4 @@ b280a1c797a3891e68dbc237e73de9cf19f426e9 4.1.1-release
bfbba2244320dc2ae47758cd7edd8fa3b67dc756 4.1.2-release
b41e1e7c7876f7656c505f552b5888b4e478f92b 5.0.0-release
c9ce2295012995e3cf5c57bcffcb4870b94c649f 5.0.1-release
+cea1632c002c065985ebea15eeeb4aac90f50545 5.0.2-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index a1ef0cae18..50e2274e6d 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-5.0.2
+5.0.3