Merged in lindenlab/viewer-bear

Fri, 02 Mar 2018 00:30:35 +0200

author
AndreyL ProductEngine <alihatskiy@productengine.com>
date
Fri, 02 Mar 2018 00:30:35 +0200
changeset 55313
e817ee85d86a
parent 55312
890ec585c269
parent 54952
d96226d41736
child 55314
3db9986f3dc2
child 55320
b335ad15f178
child 55323
29d6fbc0f354

Merged in lindenlab/viewer-bear

     1.1 --- a/.hgtags	Thu Mar 01 02:44:08 2018 +0200
     1.2 +++ b/.hgtags	Fri Mar 02 00:30:35 2018 +0200
     1.3 @@ -533,3 +533,4 @@
     1.4  40ca7118765be85a043b31b011e4ee6bd9e33c95 5.0.9-release
     1.5  ad0e15543836d64d6399d28b32852510435e344a 5.1.0-release
     1.6  26d9e9bb166a9a417f35b1863223a597af8185fd 5.1.1-release
     1.7 +2eb917875efdfe920680b9049302d0f03721245d 5.1.2-release
     2.1 --- a/autobuild.xml	Thu Mar 01 02:44:08 2018 +0200
     2.2 +++ b/autobuild.xml	Fri Mar 02 00:30:35 2018 +0200
     2.3 @@ -3260,9 +3260,9 @@
     2.4              <key>archive</key>
     2.5              <map>
     2.6                <key>hash</key>
     2.7 -              <string>30fb521e54f34d38d957fa6a8b17bad8</string>
     2.8 +              <string>f1248b6692dcbb1a42db87ca8d9fed93</string>
     2.9                <key>url</key>
    2.10 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12837/77794/viewer_manager-1.0.512124-darwin64-512124.tar.bz2</string>
    2.11 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13982/87166/viewer_manager-1.0.512801-darwin64-512801.tar.bz2</string>
    2.12              </map>
    2.13              <key>name</key>
    2.14              <string>darwin64</string>
    2.15 @@ -3284,9 +3284,9 @@
    2.16              <key>archive</key>
    2.17              <map>
    2.18                <key>hash</key>
    2.19 -              <string>0ca74b2397bee0294d767aa4e072e0c6</string>
    2.20 +              <string>c174ecc0893f8c193571b1dc80b823ad</string>
    2.21                <key>url</key>
    2.22 -              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12838/77803/viewer_manager-1.0.512124-windows-512124.tar.bz2</string>
    2.23 +              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13983/87172/viewer_manager-1.0.512801-windows-512801.tar.bz2</string>
    2.24              </map>
    2.25              <key>name</key>
    2.26              <string>windows</string>
    2.27 @@ -3297,7 +3297,7 @@
    2.28          <key>source_type</key>
    2.29          <string>hg</string>
    2.30          <key>version</key>
    2.31 -        <string>1.0.512124</string>
    2.32 +        <string>1.0.512801</string>
    2.33        </map>
    2.34        <key>vlc-bin</key>
    2.35        <map>
     3.1 --- a/indra/newview/VIEWER_VERSION.txt	Thu Mar 01 02:44:08 2018 +0200
     3.2 +++ b/indra/newview/VIEWER_VERSION.txt	Fri Mar 02 00:30:35 2018 +0200
     3.3 @@ -1,1 +1,1 @@
     3.4 -5.1.2
     3.5 +5.1.3

mercurial