summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreyL ProductEngine <alihatskiy@productengine.com>2018-05-18 02:56:00 +0300
committerAndreyL ProductEngine <alihatskiy@productengine.com>2018-05-18 02:56:00 +0300
commit5493d4d5c79bbf90e3e353548bba2354e37eee4f (patch)
tree6285d4c1d79ca565fa8a791e41f9dd23fa944810
parentc9bb75e3353f366d7eb2f789d04d589cc5d6ae0a (diff)
parentc70119ebabc4b06e2b0db02aea8c56e01fbc666e (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 091e54ebf1..0519522468 100755
--- a/.hgtags
+++ b/.hgtags
@@ -535,3 +535,4 @@ ad0e15543836d64d6399d28b32852510435e344a 5.1.0-release
26d9e9bb166a9a417f35b1863223a597af8185fd 5.1.1-release
2eb917875efdfe920680b9049302d0f03721245d 5.1.2-release
7c00e5b6cb3d95712e9d8e29277c805bca2bda90 5.1.3-release
+7b6b020fd5ad9a8dc3670c5c92d1ca92e55fc485 5.1.4-release
diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt
index 76e9e619d6..220d8e0a46 100644
--- a/indra/newview/VIEWER_VERSION.txt
+++ b/indra/newview/VIEWER_VERSION.txt
@@ -1 +1 @@
-5.1.4
+5.1.5