diff options
| author | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
|---|---|---|
| committer | Robert Knop <prospero@lindenlab.com> | 2008-12-04 22:36:34 +0000 |
| commit | 189599b6ff0c4e6b81e761fbc990c057189359f2 (patch) | |
| tree | 1e9e0e91bae9bb1ee53e57ac91cdbbfc9f6dba95 /install.xml | |
| parent | fd46865a502036b9e4414e7ec4950faf551b1f14 (diff) | |
Merging from server/server-1.25 back to trunk.
svn merge -r99446:104838 svn+ssh://svn.lindenlab.com/svn/linden/branches/server/server-1.25
Conflicts resolved by Prospero, except for one scary conflict in
SendConfirmationEmail.php which was resolved by jarv.
Diffstat (limited to 'install.xml')
| -rw-r--r-- | install.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/install.xml b/install.xml index 1d4c83269b..a1dcd7d0f5 100644 --- a/install.xml +++ b/install.xml @@ -662,30 +662,30 @@ <key>linux</key> <map> <key>md5sum</key> - <string>e398a04adb84796072dcc1f5efc69f4a</string> + <string>af7b1fc9072443009f19e43fb3c8342f</string> <key>url</key> - <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-linux-20080912.tar.bz2</uri> + <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-linux-20081029.tar.bz2</uri> </map> <key>linux32</key> <map> <key>md5sum</key> - <string>5a7821cb8aa471051e0361a74d115613</string> + <string>ca909a0a48c3dcc61656f1635fc3e3b4</string> <key>url</key> - <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-linux-i686-gcc-4.1-20080915.tar.bz2</uri> + <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-linux-i686-gcc-4.1-20081030.tar.bz2</uri> </map> <key>linux64</key> <map> <key>md5sum</key> - <string>b2095827a940c791240339dac677ef2d</string> + <string>cd4076d6caf5fabff36bf48bd01e4ba8</string> <key>url</key> - <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-linux64-20080909.tar.bz2</uri> + <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-linux64-20081030.tar.bz2</uri> </map> <key>windows</key> <map> <key>md5sum</key> <string>f25fbb29c2275267233c79f0c68ca37f</string> <key>url</key> - <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-windows-20081010.tar.bz2</uri> + <uri>scp:install-packages.lindenlab.com:/local/www/install-packages/doc/havok-4.6.1-windows-20081030.tar.bz2</uri> </map> </map> </map> |