summaryrefslogtreecommitdiff
path: root/indra/newview/res/resource.h
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-01-06 12:34:02 -0500
committerLoren Shih <seraph@lindenlab.com>2010-01-06 12:34:02 -0500
commitd9b8f65c03130f659ed0d036a9c542700a84b766 (patch)
treed50256ac783f1b3401eb32e67d4f3a14a90e672e /indra/newview/res/resource.h
parentcdb158e9e0cff7070bb68c721cec0e90b0030fb2 (diff)
parent447a908a0a46e6e0ad6ac5e8a3a26260d865243b (diff)
automated merge viewer2.0->viewer2.0
Diffstat (limited to 'indra/newview/res/resource.h')
0 files changed, 0 insertions, 0 deletions