Automated merge with https://bitbucket.org/seraph/mesh-development-vs2010

2011-04-18 17:03:51 -04:00 · 2011-04-18 17:03:51 -04:00 · ea2d89880f
parent d78a925f8f 130db30b26
commit ea2d89880f
1 changed files with 2 additions and 0 deletions
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@ -249,6 +249,7 @@ elseif(LINUX)
        libaprutil-1.so.0
        libatk-1.0.so
        libbreakpad_client.so.0
+	libcollada14dom.so
        libcrypto.so.0.9.8
        libdb-5.1.so
        libexpat.so
@ -259,6 +260,7 @@ elseif(LINUX)
        libgobject-2.0.so
        libgtest_main.so
        libgtest.so.0
+	libminizip.so
        libopenal.so
        libopenjpeg.so
        libssl.so