diff options
author | Aleric Inglewood | 2010-10-15 17:49:06 +0200 |
---|---|---|
committer | Aleric Inglewood | 2010-10-15 17:49:06 +0200 |
commit | 67f55bad571044535f1d8c3b3c3afb5078249fd3 (patch) | |
tree | d5e9f43ed6b44837faed947a09b13648d55087ba /linden/install.xml | |
parent | Revert "port of LL renderpipeline/Kirstens S19 pipeline for bridging to Viewe... (diff) | |
download | meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.zip meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.gz meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.bz2 meta-impy-67f55bad571044535f1d8c3b3c3afb5078249fd3.tar.xz |
RED-595: Manual merge with weekly-webkit.
Plus some white space fixes (TABs --> spaces) in install.xml.
Diffstat (limited to '')
-rwxr-xr-x | linden/install.xml | 68 |
1 files changed, 35 insertions, 33 deletions
diff --git a/linden/install.xml b/linden/install.xml index 0c20157..b1efd11 100755 --- a/linden/install.xml +++ b/linden/install.xml | |||
@@ -74,13 +74,13 @@ | |||
74 | <key>url</key> | 74 | <key>url</key> |
75 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-linux-i686-gcc-4.1-20080915.tar.bz2</uri> | 75 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/SDL-1.2.5-linux-i686-gcc-4.1-20080915.tar.bz2</uri> |
76 | </map> | 76 | </map> |
77 | <key>linux64</key> | 77 | <key>linux64</key> |
78 | <map> | 78 | <map> |
79 | <key>md5sum</key> | 79 | <key>md5sum</key> |
80 | <string>214fe53a11b3cdef115d36cb95aae185</string> | 80 | <string>214fe53a11b3cdef115d36cb95aae185</string> |
81 | <key>url</key> | 81 | <key>url</key> |
82 | <uri>http://imprudenceviewer.org/download/libs/SDL-1.2.12-linux64-20091230.tar.bz2</uri> | 82 | <uri>http://imprudenceviewer.org/download/libs/SDL-1.2.12-linux64-20091230.tar.bz2</uri> |
83 | </map> | 83 | </map> |
84 | <key>windows</key> | 84 | <key>windows</key> |
85 | <map> | 85 | <map> |
86 | <key>md5sum</key> | 86 | <key>md5sum</key> |
@@ -295,7 +295,7 @@ | |||
295 | </map> | 295 | </map> |
296 | </map> | 296 | </map> |
297 | </map> | 297 | </map> |
298 | <key>dbghelp</key> | 298 | <key>dbghelp</key> |
299 | <map> | 299 | <map> |
300 | <key>copyright</key> | 300 | <key>copyright</key> |
301 | <string>Copyright Microsoft Corporation</string> | 301 | <string>Copyright Microsoft Corporation</string> |
@@ -327,9 +327,9 @@ | |||
327 | <key>linux</key> | 327 | <key>linux</key> |
328 | <map> | 328 | <map> |
329 | <key>md5sum</key> | 329 | <key>md5sum</key> |
330 | <string>eb25444142d4102b0ce1b7ffaadb071e</string> | 330 | <string>bfcff12c0d5cef53aa2e04fa53299b23</string> |
331 | <key>url</key> | 331 | <key>url</key> |
332 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/dbusglib-linux-20080707.tar.bz2</uri> | 332 | <uri>http://github.com/downloads/AlericInglewood/imprudence/dbusglib-linux-20101012.tar.bz2</uri> |
333 | </map> | 333 | </map> |
334 | <key>linux64</key> | 334 | <key>linux64</key> |
335 | <map> | 335 | <map> |
@@ -816,9 +816,9 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re | |||
816 | <key>linux64</key> | 816 | <key>linux64</key> |
817 | <map> | 817 | <map> |
818 | <key>md5sum</key> | 818 | <key>md5sum</key> |
819 | <string>64e7fa98568ef52b3b9d4a18b3515090</string> | 819 | <string>8b5f413bdefec7cfe3d9ad2d69986bdc</string> |
820 | <key>url</key> | 820 | <key>url</key> |
821 | <uri>http://imprudenceviewer.org/download/libs/jpeglib-7-linux64-20091230.tar.bz2</uri> | 821 | <uri>http://github.com/downloads/AlericInglewood/imprudence/jpeglib-6b-linux64-20101012.tar.bz2</uri> |
822 | </map> | 822 | </map> |
823 | <key>windows</key> | 823 | <key>windows</key> |
824 | <map> | 824 | <map> |
@@ -1057,23 +1057,30 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura | |||
1057 | <key>darwin</key> | 1057 | <key>darwin</key> |
1058 | <map> | 1058 | <map> |
1059 | <key>md5sum</key> | 1059 | <key>md5sum</key> |
1060 | <string>becffca6bd8dcb239de284ea2a8b485b</string> | 1060 | <string>34d9e4c93678a422cf80521bf0cd7628</string> |
1061 | <key>url</key> | 1061 | <key>url</key> |
1062 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6+cookies-darwin-20100617.tar.bz2</uri> | 1062 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100914.tar.bz2</uri> |
1063 | </map> | 1063 | </map> |
1064 | <key>linux</key> | 1064 | <key>linux</key> |
1065 | <map> | 1065 | <map> |
1066 | <key>md5sum</key> | 1066 | <key>md5sum</key> |
1067 | <string>414d72dd59e3d83c96f0e1531360792e</string> | 1067 | <string>5d743c93b970abe685b185de83001a6e</string> |
1068 | <key>url</key> | 1068 | <key>url</key> |
1069 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-20100618.tar.bz2</uri> | 1069 | <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-linux-qt4.6-20100923.tar.bz2</uri> |
1070 | </map> | ||
1071 | <key>linux64</key> | ||
1072 | <map> | ||
1073 | <key>md5sum</key> | ||
1074 | <string>863f7b31556b1d368651f85457f4e46d</string> | ||
1075 | <key>url</key> | ||
1076 | <uri>http://github.com/downloads/AlericInglewood/imprudence/llqtwebkit-linux64-20101012.1.tar.bz2</uri> | ||
1070 | </map> | 1077 | </map> |
1071 | <key>windows</key> | 1078 | <key>windows</key> |
1072 | <map> | 1079 | <map> |
1073 | <key>md5sum</key> | 1080 | <key>md5sum</key> |
1074 | <string>df1bdd683128e060d60e435f65d8f7e8</string> | 1081 | <string>4b8412833c00f8cdaba26808f0ddb404</string> |
1075 | <key>url</key> | 1082 | <key>url</key> |
1076 | <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100617.tar.bz2</uri> | 1083 | <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100916.tar.bz2</uri> |
1077 | </map> | 1084 | </map> |
1078 | </map> | 1085 | </map> |
1079 | </map> | 1086 | </map> |
@@ -1636,7 +1643,7 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn | |||
1636 | <key>url</key> | 1643 | <key>url</key> |
1637 | <string>http://www.xfree86.org/4.4.0/LICENSE9.html#sgi</string> | 1644 | <string>http://www.xfree86.org/4.4.0/LICENSE9.html#sgi</string> |
1638 | </map> | 1645 | </map> |
1639 | <key>MSDTW</key> | 1646 | <key>MSDTW</key> |
1640 | <map> | 1647 | <map> |
1641 | <key>text</key> | 1648 | <key>text</key> |
1642 | <string>MICROSOFT SOFTWARE LICENSE TERMS | 1649 | <string>MICROSOFT SOFTWARE LICENSE TERMS |
@@ -1843,12 +1850,12 @@ Cass Everitt - cass@r3.nu | |||
1843 | <key>text</key> | 1850 | <key>text</key> |
1844 | <string>on file</string> | 1851 | <string>on file</string> |
1845 | </map> | 1852 | </map> |
1846 | <key>hunspell</key> | 1853 | <key>hunspell</key> |
1847 | <map> | 1854 | <map> |
1848 | <key>url</key> | 1855 | <key>url</key> |
1849 | <string>http://www.gnu.org/licenses/gpl.html</string> | 1856 | <string>http://www.gnu.org/licenses/gpl.html</string> |
1850 | </map> | 1857 | </map> |
1851 | <key>hunspell-dictionaries</key> | 1858 | <key>hunspell-dictionaries</key> |
1852 | <map> | 1859 | <map> |
1853 | <key>url</key> | 1860 | <key>url</key> |
1854 | <string>http://www.gnu.org/licenses/gpl.html</string> | 1861 | <string>http://www.gnu.org/licenses/gpl.html</string> |
@@ -1864,13 +1871,13 @@ Cass Everitt - cass@r3.nu | |||
1864 | <key>text</key> | 1871 | <key>text</key> |
1865 | <string>http://nyctergatis.com/jpeglib/</string> | 1872 | <string>http://nyctergatis.com/jpeglib/</string> |
1866 | </map> | 1873 | </map> |
1867 | <key>jsoncpp</key> | 1874 | <key>jsoncpp</key> |
1868 | <map> | 1875 | <map> |
1869 | <key>text</key> | 1876 | <key>text</key> |
1870 | <string>The json-cpp library and this documentation are in Public Domain. Retrieved from http://jsoncpp.sourceforge.net/ on 2009-09-04.</string> | 1877 | <string>The json-cpp library and this documentation are in Public Domain. Retrieved from http://jsoncpp.sourceforge.net/ on 2009-09-04.</string> |
1871 | <key>url</key> | 1878 | <key>url</key> |
1872 | <string>http://jsoncpp.sourceforge.net</string> | 1879 | <string>http://jsoncpp.sourceforge.net</string> |
1873 | </map> | 1880 | </map> |
1874 | <key>kdu</key> | 1881 | <key>kdu</key> |
1875 | <map> | 1882 | <map> |
1876 | <key>text</key> | 1883 | <key>text</key> |
@@ -1911,11 +1918,6 @@ Cass Everitt - cass@r3.nu | |||
1911 | <key>text</key> | 1918 | <key>text</key> |
1912 | <string>Multiple licenses. See package contents for details.</string> | 1919 | <string>Multiple licenses. See package contents for details.</string> |
1913 | </map> | 1920 | </map> |
1914 | <key>mozillaPL</key> | ||
1915 | <map> | ||
1916 | <key>url</key> | ||
1917 | <string>http://www.mozilla.org/MPL/MPL-1.1.html</string> | ||
1918 | </map> | ||
1919 | <key>xiph-bsd</key> | 1921 | <key>xiph-bsd</key> |
1920 | <map> | 1922 | <map> |
1921 | <key>url</key> | 1923 | <key>url</key> |