summaryrefslogtreecommitdiff
path: root/indra/newview/res/resource.h
diff options
context:
space:
mode:
authorLis Linden <lis@lindenlab.com>2010-02-01 18:20:15 -0500
committerLis Linden <lis@lindenlab.com>2010-02-01 18:20:15 -0500
commit2fea74af062cb0da409d82fbae4a40eca2c57323 (patch)
tree8ee3f0d1a341d04edf22ae2aaa5373d0c538e412 /indra/newview/res/resource.h
parent0f8cdbe72a7b76bc1ca26b4573ab360ea4b12376 (diff)
parent51e3bdcb398068c0c304dced296d58762165a84f (diff)
Automated merge with ssh://lis@hg.lindenlab.com/viewer/viewer-2-0
Diffstat (limited to 'indra/newview/res/resource.h')
0 files changed, 0 insertions, 0 deletions