diff options
| author | David Walter Seikel | 2011-07-21 21:00:47 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2011-07-21 21:00:47 +1000 |
| commit | f4d07b4a04b432141d8426932f4dd955b9f1a9f1 (patch) | |
| tree | 1b8e09f6c0ba902fb2212e9c05c4b361fbcb6bbb /linden/install.xml | |
| parent | Bump version number. (diff) | |
| parent | Support modulo in llcalcparser (diff) | |
| download | meta-impy-f4d07b4a04b432141d8426932f4dd955b9f1a9f1.zip meta-impy-f4d07b4a04b432141d8426932f4dd955b9f1a9f1.tar.gz meta-impy-f4d07b4a04b432141d8426932f4dd955b9f1a9f1.tar.bz2 meta-impy-f4d07b4a04b432141d8426932f4dd955b9f1a9f1.tar.xz | |
Merge remote-tracking branch 'imprudence/1.4-beta1.5' into next
Conflicts (merged manually):
.gitignore
linden/indra/newview/llgesturemgr.cpp
linden/indra/newview/viewerinfo.cpp
Diffstat (limited to 'linden/install.xml')
| -rwxr-xr-x | linden/install.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/linden/install.xml b/linden/install.xml index d25636d..24c201b 100755 --- a/linden/install.xml +++ b/linden/install.xml | |||
| @@ -1173,9 +1173,9 @@ Copyright (C) 2004-2005 Vladimir Berezniker @ http://public.xdi.org/=vmpn | |||
| 1173 | <key>windows</key> | 1173 | <key>windows</key> |
| 1174 | <map> | 1174 | <map> |
| 1175 | <key>md5sum</key> | 1175 | <key>md5sum</key> |
| 1176 | <string>79bb92dcc79e310ff9aebf7fbe6b10e5</string> | 1176 | <string>8ded552db94e06574db77a83ff672420</string> |
| 1177 | <key>url</key> | 1177 | <key>url</key> |
| 1178 | <uri>http://imprudenceviewer.org/download/libs/openal-soft-1.12.854-windows-20100822.tar.bz2</uri> | 1178 | <uri>http://download.kokuaviewer.org/files/libs/openal-soft-1.13-windows-20110624.tar.bz2</uri> |
| 1179 | </map> | 1179 | </map> |
| 1180 | </map> | 1180 | </map> |
| 1181 | </map> | 1181 | </map> |