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.

964e9814

Commit 964e9814 authored 14 years ago by Oz Linden

Downloads
- Plain Diff

merge changes for vwr-1095

parents 8cfea0ba 8a939212

No related branches found

No related tags found

No related merge requests found

Changes 10

Expand all Hide whitespace changes

Inline Side-by-side

Showing

indra/cmake/GetPrerequisites_2_8.cmake 786 additions, 786 deletions

indra/cmake/GetPrerequisites_2_8.cmake
indra/cmake/LLAddBuildTest.cmake 276 additions, 276 deletions

indra/cmake/LLAddBuildTest.cmake
indra/newview/llfloaterwebcontent.cpp 402 additions, 402 deletions

indra/newview/llfloaterwebcontent.cpp
indra/newview/llfloaterwebcontent.h 81 additions, 81 deletions

indra/newview/llfloaterwebcontent.h
indra/newview/llimview.cpp 13 additions, 13 deletions

indra/newview/llimview.cpp
indra/newview/llimview.h 1 addition, 1 deletion

indra/newview/llimview.h
indra/newview/lllogchat.cpp 9 additions, 9 deletions

indra/newview/lllogchat.cpp
indra/newview/skins/default/xui/en/floater_web_content.xml 190 additions, 190 deletions

indra/newview/skins/default/xui/en/floater_web_content.xml
indra/newview/tests/llremoteparcelrequest_test.cpp 134 additions, 134 deletions

indra/newview/tests/llremoteparcelrequest_test.cpp
indra/viewer_components/updater/tests/llupdaterservice_test.cpp 200 additions, 200 deletions

...viewer_components/updater/tests/llupdaterservice_test.cpp

with 2092 additions and 2092 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