diff options
| author | Aleric Inglewood | 2010-11-09 16:06:12 +0100 |
|---|---|---|
| committer | Aleric Inglewood | 2010-11-09 16:06:12 +0100 |
| commit | 2f088795d249b1b240e34b697ed4d5dfa501f187 (patch) | |
| tree | e639cd9eb86bd3928717a072d7401115eaf9c3f9 /linden/install.xml | |
| parent | Merge remote branch 'robin/SNOW-713' into SNOW-713 (diff) | |
| parent | As we currently do not build the gstreamer plugin for windows, do not try to ... (diff) | |
| download | meta-impy-2f088795d249b1b240e34b697ed4d5dfa501f187.zip meta-impy-2f088795d249b1b240e34b697ed4d5dfa501f187.tar.gz meta-impy-2f088795d249b1b240e34b697ed4d5dfa501f187.tar.bz2 meta-impy-2f088795d249b1b240e34b697ed4d5dfa501f187.tar.xz | |
IMP-692: SNOW-713: Merge branch 'weekly' into SNOW-713
Conflicts:
linden/indra/newview/viewer_manifest.py
Trivial proximity collision. Resolved.
Diffstat (limited to 'linden/install.xml')
| -rwxr-xr-x | linden/install.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/linden/install.xml b/linden/install.xml index af31d31..1df31e2 100755 --- a/linden/install.xml +++ b/linden/install.xml | |||
| @@ -700,9 +700,9 @@ cairo: Copyright © 2002 University of Southern California, Copyright © 2005 Re | |||
| 700 | <key>linux</key> | 700 | <key>linux</key> |
| 701 | <map> | 701 | <map> |
| 702 | <key>md5sum</key> | 702 | <key>md5sum</key> |
| 703 | <string>57ec243cf8e05e4fb7c737846a287498</string> | 703 | <string>349ee367e0ac1e878b24b66e449c6ff8</string> |
| 704 | <key>url</key> | 704 | <key>url</key> |
| 705 | <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux32-dbg-20100604.tar.bz2</uri> | 705 | <uri>http://imprudenceviewer.org/download/libs/gtk-etc-linux-20101106.1.tar.bz2</uri> |
| 706 | </map> | 706 | </map> |
| 707 | <key>linux64</key> | 707 | <key>linux64</key> |
| 708 | <map> | 708 | <map> |
| @@ -1057,9 +1057,9 @@ Portions copyright (C) 1997 - 2002, Makoto Matsumoto and Takuji Nishimura | |||
| 1057 | <key>windows</key> | 1057 | <key>windows</key> |
| 1058 | <map> | 1058 | <map> |
| 1059 | <key>md5sum</key> | 1059 | <key>md5sum</key> |
| 1060 | <string>4b8412833c00f8cdaba26808f0ddb404</string> | 1060 | <string>df1bdd683128e060d60e435f65d8f7e8</string> |
| 1061 | <key>url</key> | 1061 | <key>url</key> |
| 1062 | <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100916.tar.bz2</uri> | 1062 | <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100617.tar.bz2</uri> |
| 1063 | </map> | 1063 | </map> |
| 1064 | </map> | 1064 | </map> |
| 1065 | </map> | 1065 | </map> |