diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-08-18 17:52:00 -0400 |
| commit | ce0b04889d3d02d1d1eabe84a566a641db1e2d8e (patch) | |
| tree | f9501fe5624d4a0a40ce6e87fe2fb87ae2d4f476 /indra/newview/viewer_manifest.py | |
| parent | 4fb809eed5fbed458b5be883fba7196a5712aa48 (diff) | |
| parent | b2ef0f99882db73680cc5dfb9570255414f7ba6d (diff) | |
Merge.
Diffstat (limited to 'indra/newview/viewer_manifest.py')
| -rw-r--r-- | indra/newview/viewer_manifest.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index cd9d52cb85..0a21d8714c 100644 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -750,7 +750,7 @@ class DarwinManifest(ViewerManifest): "libexpat.1.5.2.dylib", "libexception_handler.dylib", "libGLOD.dylib", - "libcollada14dom.dylib" + "libcollada14dom.dylib" ): target_lib = os.path.join('../../..', libfile) self.run_command("ln -sf %(target)r %(link)r" % @@ -1027,15 +1027,15 @@ class Linux_i686Manifest(LinuxManifest): self.path("libbreakpad_client.so.0.0.0") self.path("libbreakpad_client.so.0") self.path("libbreakpad_client.so") - self.path("libcollada14dom.so") + self.path("libcollada14dom.so") self.path("libdb-5.1.so") self.path("libdb-5.so") self.path("libdb.so") self.path("libcrypto.so.1.0.0") self.path("libexpat.so.1.5.2") self.path("libssl.so.1.0.0") - self.path("libglod.so") - self.path("libminizip.so") + self.path("libglod.so") + self.path("libminizip.so") self.path("libuuid.so") self.path("libuuid.so.16") self.path("libuuid.so.16.0.22") |