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.

b6a7c8fc

Commit b6a7c8fc authored 12 years ago by Logan Dethrow

Downloads
- Plain Diff

Merge in backed out changes.

parents 954200e9 a15ec8d0

No related branches found

No related tags found

No related merge requests found

Changes 985

Hide whitespace changes

Inline Side-by-side

Showing

.hgtags 75 additions, 15 deletions

.hgtags
BuildParams 3 additions, 11 deletions

BuildParams
autobuild.xml 56 additions, 16 deletions

autobuild.xml
build.sh 0 additions, 4 deletions

build.sh
doc/contributions.txt 18 additions, 1 deletion

doc/contributions.txt
etc/message.xml 0 additions, 8 deletions

etc/message.xml
indra/CMakeLists.txt 1 addition, 0 deletions

indra/CMakeLists.txt
indra/cmake/00-Common.cmake 7 additions, 1 deletion

indra/cmake/00-Common.cmake
indra/cmake/Boost.cmake 48 additions, 14 deletions

indra/cmake/Boost.cmake
indra/cmake/Copy3rdPartyLibs.cmake 12 additions, 3 deletions

indra/cmake/Copy3rdPartyLibs.cmake
indra/cmake/GooglePerfTools.cmake 30 additions, 10 deletions

indra/cmake/GooglePerfTools.cmake
indra/cmake/LLAddBuildTest.cmake 9 additions, 0 deletions

indra/cmake/LLAddBuildTest.cmake
indra/cmake/LLCommon.cmake 1 addition, 1 deletion

indra/cmake/LLCommon.cmake
indra/cmake/LLCoreHttp.cmake 16 additions, 0 deletions

indra/cmake/LLCoreHttp.cmake
indra/cmake/LLPrimitive.cmake 4 additions, 4 deletions

indra/cmake/LLPrimitive.cmake
indra/cmake/Variables.cmake 16 additions, 1 deletion

indra/cmake/Variables.cmake
indra/edit-me-to-trigger-new-build.txt 1 addition, 0 deletions

indra/edit-me-to-trigger-new-build.txt
indra/integration_tests/llimage_libtest/llimage_libtest.cpp 1 addition, 1 deletion

indra/integration_tests/llimage_libtest/llimage_libtest.cpp
indra/integration_tests/llui_libtest/llui_libtest.cpp 14 additions, 15 deletions

indra/integration_tests/llui_libtest/llui_libtest.cpp
indra/lib/python/indra/util/llmanifest.py 27 additions, 1 deletion

indra/lib/python/indra/util/llmanifest.py

with 339 additions and 106 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