summaryrefslogtreecommitdiff
path: root/indra/newview/res
diff options
context:
space:
mode:
authorChuck Linden <chuck@lindenlab.com>2010-02-01 18:23:22 -0500
committerChuck Linden <chuck@lindenlab.com>2010-02-01 18:23:22 -0500
commitfdc32a367f2f7e19010a26ef338163474850e8bd (patch)
tree1b8e6144e721102f93e5ff4be0f7dc57065cb770 /indra/newview/res
parent2fea74af062cb0da409d82fbae4a40eca2c57323 (diff)
parentf119b1652d3fc72e3cbd19b3f95ac1ce1f87ed34 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
Diffstat (limited to 'indra/newview/res')
0 files changed, 0 insertions, 0 deletions