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.

26dafd22

Commit 26dafd22 authored 11 years ago by David Parks

Downloads
- Plain Diff

Automated merge with https://bitbucket.org/lindenlab/viewer-lion

parents 782a7e26 f023c677

No related branches found

No related tags found

No related merge requests found

Changes 2

Hide whitespace changes

Inline Side-by-side

Showing

indra/newview/llcolorswatch.h 3 additions, 0 deletions

indra/newview/llcolorswatch.h
indra/newview/llfloatercolorpicker.cpp 10 additions, 4 deletions

indra/newview/llfloatercolorpicker.cpp

with 13 additions and 4 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