livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Automated merge with head of viewer64

meow-7.2.2
callum_linden 2017-12-13 12:39:37 -08:00
parent ab94da9baf df21b99723
commit 6746be477b
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
autobuild.xml
View File

@ -3231,9 +3231,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>92235fabdca2d3865014f7ec630e2688</string>
<string>8bb2754bb078713f875e7374c95294fc</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11444/64857/viewer_manager-1.0.511221-darwin64-511221.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11619/66949/viewer_manager-1.0.511355-darwin64-511355.tar.bz2</string>
</map>
<key>name</key>
<string>darwin64</string>
@ -3255,9 +3255,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>bfea9c61d0b29d741081c0c8a315d364</string>
<string>cc406ba4d9250e4c959c99b64877248f</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11446/64863/viewer_manager-1.0.511221-windows-511221.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11620/66955/viewer_manager-1.0.511355-windows-511355.tar.bz2</string>
</map>
<key>name</key>
<string>windows</string>
@ -3268,7 +3268,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>source_type</key>
<string>hg</string>
<key>version</key>
<string>1.0.511221</string>
<string>1.0.511355</string>
</map>
<key>vlc-bin</key>
<map>

2
indra/newview/app_settings/settings.xml
View File

@ -12332,7 +12332,7 @@
<key>UpdaterMaximumBandwidth</key>
<map>
<key>Comment</key>
<string>Maximum allowable downstream bandwidth for updater service (kilo bits per second)</string>
<string>Obsolete: this parameter is no longer used.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>