Merge LL viewer release 5.1.4

Fri, 18 May 2018 08:44:51 +0200

author
Ansariel
date
Fri, 18 May 2018 08:44:51 +0200
changeset 55379
a780668b9a62
parent 55376
d1e62eb8b2ac
parent 55378
d882f26e1ef1
child 55380
2a57bc8fe712

Merge LL viewer release 5.1.4

.hgtags file | annotate | diff | revisions
indra/newview/VIEWER_VERSION.txt file | annotate | diff | revisions
     1.1 --- a/.hgtags	Fri May 18 08:43:48 2018 +0200
     1.2 +++ b/.hgtags	Fri May 18 08:44:51 2018 +0200
     1.3 @@ -573,3 +573,4 @@
     1.4  26d9e9bb166a9a417f35b1863223a597af8185fd 5.1.1-release
     1.5  2eb917875efdfe920680b9049302d0f03721245d 5.1.2-release
     1.6  7c00e5b6cb3d95712e9d8e29277c805bca2bda90 5.1.3-release
     1.7 +7b6b020fd5ad9a8dc3670c5c92d1ca92e55fc485 5.1.4-release
     2.1 --- a/indra/newview/VIEWER_VERSION.txt	Fri May 18 08:43:48 2018 +0200
     2.2 +++ b/indra/newview/VIEWER_VERSION.txt	Fri May 18 08:44:51 2018 +0200
     2.3 @@ -1,1 +1,1 @@
     2.4 -5.1.4
     2.5 +5.1.5

mercurial