Skip to content
Snippets Groups Projects
Commit 2af6a857 authored by callum_linden's avatar callum_linden
Browse files

Automated merge with head of viewer64

parents 238c92b2 17891cfc
No related branches found
No related tags found
No related merge requests found
......@@ -3231,9 +3231,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>archive</key>
<map>
<key>hash</key>
<string>75e29dcb5b326eddd473a841436cf226</string>
<string>a8071b247d78e5555340f83e3491e7df</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11895/69299/viewer_manager-1.0.511542-darwin64-511542.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12055/70540/viewer_manager-1.0.511658-darwin64-511658.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>e27bdc13c25d68aeb65238752e8d067e</string>
<string>a9597ba92618b2616e058dee8f56c80c</string>
<key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/11897/69334/viewer_manager-1.0.511542-windows-511542.tar.bz2</string>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/ct2/12056/70546/viewer_manager-1.0.511658-windows-511658.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.511542</string>
<string>1.0.511658</string>
</map>
<key>vlc-bin</key>
<map>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment