diff options
| author | simon <none@none> | 2014-10-20 13:54:37 -0700 |
|---|---|---|
| committer | simon <none@none> | 2014-10-20 13:54:37 -0700 |
| commit | 4b333e36d1814f1aadf8e57a1810ecdc6a6b9757 (patch) | |
| tree | 1170a4f7ce2292e9e84eac7b81fb3842147c7589 | |
| parent | 825b4339db535c2672fd5b8779d142f093aec974 (diff) | |
| parent | 61be636a104d51f908393876326d71e1cff793f8 (diff) | |
Merge downsteam code and become version 3.7.19
| -rwxr-xr-x | .hgtags | 1 | ||||
| -rwxr-xr-x | autobuild.xml | 12 | ||||
| -rw-r--r-- | indra/newview/VIEWER_VERSION.txt | 2 |
3 files changed, 8 insertions, 7 deletions
@@ -490,3 +490,4 @@ a7872554f3665588f1e8347d472cec3a299254b3 3.7.14-release 3f11f57f2b4d15a9f987d12bc70ef507eefb5018 3.7.15-release 562e7dace7465060ac9adb2e8eca800b699ff024 3.7.16-release bcc2770e21c125e0bab59141c51db9145aec068d 3.7.17-release +2729c1daf0257d68a40bdbc4acf1a16184974bbd 3.7.18-release diff --git a/autobuild.xml b/autobuild.xml index 4fe6725dca..6f4617e8c3 100755 --- a/autobuild.xml +++ b/autobuild.xml @@ -1444,9 +1444,9 @@ <key>archive</key> <map> <key>hash</key> - <string>79afb464255be2be7c02fdfac10bcd5c</string> + <string>3c2b6be4c78b2479c3fae612e1053d37</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-llqtwebkit2/rev/290663/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20140605.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/canonical_3p-llqtwebkit2/rev/295522/arch/Darwin/installer/llqtwebkit-4.7.1-darwin-20141015.tar.bz2</string> </map> <key>name</key> <string>darwin</string> @@ -1456,9 +1456,9 @@ <key>archive</key> <map> <key>hash</key> - <string>090190a8dd80efe1f0933c7ed307e6f1</string> + <string>d31358176b9ba8c676458cc061767c0b</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-llqtwebkit2/rev/290663/arch/Linux/installer/llqtwebkit-4.7.1-linux-20140605.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/canonical_3p-llqtwebkit2/rev/295522/arch/Linux/installer/llqtwebkit-4.7.1-linux-20141015.tar.bz2</string> </map> <key>name</key> <string>linux</string> @@ -1468,9 +1468,9 @@ <key>archive</key> <map> <key>hash</key> - <string>650f2a30a83eacde238fcc87ff161190</string> + <string>bb4e8c8006c8a7aef6d3e3c36a8cebbf</string> <key>url</key> - <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3pl_3p-llqtwebkit2/rev/290663/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20140605.tar.bz2</string> + <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/canonical_3p-llqtwebkit2/rev/295522/arch/CYGWIN/installer/llqtwebkit-4.7.1-windows-20141015.tar.bz2</string> </map> <key>name</key> <string>windows</string> diff --git a/indra/newview/VIEWER_VERSION.txt b/indra/newview/VIEWER_VERSION.txt index 972d41a5f5..7707ee0e29 100644 --- a/indra/newview/VIEWER_VERSION.txt +++ b/indra/newview/VIEWER_VERSION.txt @@ -1 +1 @@ -3.7.18 +3.7.19 |