diff options
| author | Don Kjer <don@lindenlab.com> | 2007-07-26 01:22:23 +0000 |
|---|---|---|
| committer | Don Kjer <don@lindenlab.com> | 2007-07-26 01:22:23 +0000 |
| commit | 9746cf5310871f305a1419163c5adfbed3f1534b (patch) | |
| tree | d1f1d278927683fe837173318cc0da1e3c2f8ca4 /indra/newview/viewer_manifest.py | |
| parent | 4284da17878eb9f8ade673d172148d34887aa816 (diff) | |
EFFECTIVE MERGE: svn merge -r 65485:66133 svn+ssh://svn/svn/linden/branches/maintenance into release
This includes fixes to the maintenance-r66133 branch, and sync'ing up with release@r66392
ACTUAL MERGE: svn merge -r 66394:66435 svn+ssh://svn/svn/linden/branches/release-r66392 into release
EQUIVALENT TO: svn merge -r 65485:66434 svn+ssh://svn/svn/linden/branches/maintenance-r66133 into release (plus branch sync'ing)
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rwxr-xr-x | indra/newview/viewer_manifest.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 0fe81baae9..c93b302312 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -414,6 +414,7 @@ class Linux_i686Manifest(LinuxManifest): self.path("libuuid.so", "libuuid.so.1") self.path("libSDL-1.2.so.0") self.path("libELFIO.so") + #self.path("libresolv.so") - don't bundle #self.path("libtcmalloc.so.0") - bugged #self.path("libstacktrace.so.0") - probably bugged self.path("libllkdu.so", "../bin/libllkdu.so") # llkdu goes in bin for some reason |