summaryrefslogtreecommitdiff
path: root/indra/newview/llcolorswatch.cpp
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2009-11-03 00:47:23 +0000
committerLoren Shih <seraph@lindenlab.com>2009-11-03 00:47:23 +0000
commit2f2bdd83d6e078fb6cdcbb0ba0a9eaa38d45cc90 (patch)
tree54de76637c610b85957197c9218d77e3c8212f00 /indra/newview/llcolorswatch.cpp
parentf732ee6d2e24cd42a06b9cf51c8f6c577f2e476e (diff)
For QAR-2014 : Sandbox for testing FolderTypes [VIEWER]
svn merge -r136068:136089 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/folder-types__merge__viewer2.0.0-3-r135948 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 Infrastructure changes for cleaning up Asset/Folder types. Associated sim changes are only so that the sim still compiles.
Diffstat (limited to 'indra/newview/llcolorswatch.cpp')
0 files changed, 0 insertions, 0 deletions