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.

05d58c91

Commit 05d58c91 authored 8 years ago by Nat Goodspeed

Downloads
- Plain Diff

Automated merge with ssh://bitbucket.org/lindenlab/viewer-release

parents 68413474 4ca084f7

No related branches found

No related tags found

No related merge requests found

Changes 76

Hide whitespace changes

Inline Side-by-side

Showing

.hgignore 2 additions, 0 deletions

.hgignore
BuildParams 4 additions, 0 deletions

BuildParams
autobuild.xml 1318 additions, 334 deletions

autobuild.xml
indra/cmake/00-Common.cmake 28 additions, 22 deletions

indra/cmake/00-Common.cmake
indra/cmake/CMakeLists.txt 0 additions, 5 deletions

indra/cmake/CMakeLists.txt
indra/cmake/ConfigurePkgConfig.cmake 3 additions, 3 deletions

indra/cmake/ConfigurePkgConfig.cmake
indra/cmake/Copy3rdPartyLibs.cmake 18 additions, 28 deletions

indra/cmake/Copy3rdPartyLibs.cmake
indra/cmake/GLEXT.cmake 1 addition, 1 deletion

indra/cmake/GLEXT.cmake
indra/cmake/GLH.cmake 1 addition, 1 deletion

indra/cmake/GLH.cmake
indra/cmake/Glui.cmake 0 additions, 28 deletions

indra/cmake/Glui.cmake
indra/cmake/Glut.cmake 0 additions, 19 deletions

indra/cmake/Glut.cmake
indra/cmake/GooglePerfTools.cmake 0 additions, 61 deletions

indra/cmake/GooglePerfTools.cmake
indra/cmake/LLCommon.cmake 0 additions, 3 deletions

indra/cmake/LLCommon.cmake
indra/cmake/QuickTimePlugin.cmake 0 additions, 48 deletions

indra/cmake/QuickTimePlugin.cmake
indra/cmake/UI.cmake 2 additions, 2 deletions

indra/cmake/UI.cmake
indra/cmake/Variables.cmake 39 additions, 33 deletions

indra/cmake/Variables.cmake
indra/llcommon/CMakeLists.txt 3 additions, 8 deletions

indra/llcommon/CMakeLists.txt
indra/llcommon/llallocator.cpp 0 additions, 43 deletions

indra/llcommon/llallocator.cpp
indra/llcommon/llcoros.cpp 4 additions, 0 deletions

indra/llcommon/llcoros.cpp
indra/llcommon/lldependencies.h 3 additions, 3 deletions

indra/llcommon/lldependencies.h

with 1426 additions and 642 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