Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Releases
- Package registry
- Terraform modules

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

aa5a591a

Commit aa5a591a authored 8 years ago by Nat Goodspeed

Downloads
- Plain Diff

Automated merge with ssh://bitbucket.org/lindenlab/viewer64

parents c9f6905e 89cd49f6

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

BuildParams 0 additions, 1 deletion

BuildParams
autobuild.xml 53 additions, 41 deletions

autobuild.xml
indra/cmake/00-Common.cmake 1 addition, 1 deletion

indra/cmake/00-Common.cmake
indra/cmake/Copy3rdPartyLibs.cmake 2 additions, 5 deletions

indra/cmake/Copy3rdPartyLibs.cmake
indra/cmake/EXPAT.cmake 6 additions, 0 deletions

indra/cmake/EXPAT.cmake
indra/cmake/Variables.cmake 33 additions, 7 deletions

indra/cmake/Variables.cmake
indra/integration_tests/llimage_libtest/CMakeLists.txt 6 additions, 4 deletions

indra/integration_tests/llimage_libtest/CMakeLists.txt
indra/llcorehttp/CMakeLists.txt 6 additions, 4 deletions

indra/llcorehttp/CMakeLists.txt
indra/llvfs/lldir_mac.cpp 1 addition, 1 deletion

indra/llvfs/lldir_mac.cpp
indra/newview/app_settings/settings.xml 2 additions, 2 deletions

indra/newview/app_settings/settings.xml

with 110 additions and 66 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment