Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

Alchemy Viewer
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

Silent mode is enabled

All outbound communications are blocked. Learn more.

56cbfdd5

Commit 56cbfdd5 authored 11 years ago by Nat Goodspeed

Downloads
- Plain Diff

Automated merge with http://bitbucket.org/nat_linden/viewer-maint-3489

parents a55f8810 6c44fe90

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

BuildParams 4 additions, 4 deletions

BuildParams
build.sh 2 additions, 3 deletions

build.sh
indra/lib/python/indra/util/llmanifest.py 18 additions, 15 deletions

indra/lib/python/indra/util/llmanifest.py
indra/newview/CMakeLists.txt 4 additions, 1 deletion

indra/newview/CMakeLists.txt
indra/newview/installers/windows/installer_template.nsi 8 additions, 20 deletions

indra/newview/installers/windows/installer_template.nsi
indra/newview/viewer_manifest.py 110 additions, 147 deletions

indra/newview/viewer_manifest.py

with 146 additions and 190 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