diff options
| author | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
|---|---|---|
| committer | Jacek Antonelli | 2008-10-17 20:01:38 -0500 |
| commit | fdf944fb0355249d73c4e25ee86e9ffd378e7d4b (patch) | |
| tree | 2e5c51fe0e6d5757f984721e01cc097801d927e7 /linden/indra/newview/viewer_manifest.py | |
| parent | Rebranded Windows-specific installer/support files. (diff) | |
| parent | Updated source to SL version 1.21.6. (diff) | |
| download | meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.zip meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.gz meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.bz2 meta-impy-fdf944fb0355249d73c4e25ee86e9ffd378e7d4b.tar.xz | |
Merge branch 'merge-1.21.6' into rebranding
Conflicts:
linden/indra/newview/installers/windows/installer_template.nsi
linden/indra/newview/llappviewer.cpp
Diffstat (limited to 'linden/indra/newview/viewer_manifest.py')
| -rwxr-xr-x | linden/indra/newview/viewer_manifest.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/linden/indra/newview/viewer_manifest.py b/linden/indra/newview/viewer_manifest.py index 2533e6a..1d9c1f7 100755 --- a/linden/indra/newview/viewer_manifest.py +++ b/linden/indra/newview/viewer_manifest.py | |||
| @@ -618,6 +618,7 @@ class Linux_i686Manifest(LinuxManifest): | |||
| 618 | self.path("libaprutil-1.so.0") | 618 | self.path("libaprutil-1.so.0") |
| 619 | self.path("libdb-4.2.so") | 619 | self.path("libdb-4.2.so") |
| 620 | self.path("libcrypto.so.0.9.7") | 620 | self.path("libcrypto.so.0.9.7") |
| 621 | self.path("libexpat.so.1") | ||
| 621 | self.path("libssl.so.0.9.7") | 622 | self.path("libssl.so.0.9.7") |
| 622 | # self.path("libstdc++.so.6") | 623 | # self.path("libstdc++.so.6") |
| 623 | self.path("libuuid.so", "libuuid.so.1") | 624 | self.path("libuuid.so", "libuuid.so.1") |