diff options
| author | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-03-02 00:30:35 +0200 |
|---|---|---|
| committer | AndreyL ProductEngine <alihatskiy@productengine.com> | 2018-03-02 00:30:35 +0200 |
| commit | 722547cd51376f8257e87310884d811d5f899819 (patch) | |
| tree | bd6940e07391782fbb51171b133e2441483747cf | |
| parent | 5100abb778b779d34e02892297d9d99a07280612 (diff) | |
| parent | f8c76535a35aaf245e261357a59e977bac5b2501 (diff) | |
Merged in lindenlab/viewer-bear
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rw-r--r-- | autobuild.xml | 10 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
3 files changed, 7 insertions, 6 deletions
@@ -533,3 +533,4 @@ abcab37e1b29414ab8c03af9ca2ab489d809788a 5.0.7-release 40ca7118765be85a043b31b011e4ee6bd9e33c95 5.0.9-release ad0e15543836d64d6399d28b32852510435e344a 5.1.0-release 26d9e9bb166a9a417f35b1863223a597af8185fd 5.1.1-release +2eb917875efdfe920680b9049302d0f03721245d 5.1.2-release diff --git a/autobuild.xml b/autobuild.xml index 45f0c26522..c63b7ff9c6 100644 --- a/autobuild.xml +++ b/autobuild.xml @@ -3260,9 +3260,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>30fb521e54f34d38d957fa6a8b17bad8</string> + <string>f1248b6692dcbb1a42db87ca8d9fed93</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12837/77794/viewer_manager-1.0.512124-darwin64-512124.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13982/87166/viewer_manager-1.0.512801-darwin64-512801.tar.bz2</string> </map> <key>name</key> <string>darwin64</string> @@ -3284,9 +3284,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>archive</key> <map> <key>hash</key> - <string>0ca74b2397bee0294d767aa4e072e0c6</string> + <string>c174ecc0893f8c193571b1dc80b823ad</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12838/77803/viewer_manager-1.0.512124-windows-512124.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/13983/87172/viewer_manager-1.0.512801-windows-512801.tar.bz2</string> </map> <key>name</key> <string>windows</string> @@ -3297,7 +3297,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string> <key>source_type</key> <string>hg</string> <key>version</key> - <string>1.0.512124</string> + <string>1.0.512801</string> </map> <key>vlc-bin</key> <map> diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 61fcc87350..cdb98d26e4 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -5.1.2 +5.1.3 |