summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaternamedesc.h
diff options
context:
space:
mode:
authorRichard Linden <none@none>2012-01-13 11:21:37 -0800
committerRichard Linden <none@none>2012-01-13 11:21:37 -0800
commit86009704769a79768eb02f459b1b99ea060e5fc1 (patch)
tree5db6bb6a0bfcd204e3aafe63c977ffb0672d3d8a /indra/newview/llfloaternamedesc.h
parentf1c27071047e776536f8aa963b83f8772275e7c3 (diff)
parent16112a32e83c6d67acfffdbe339fa7b7b9dd4be3 (diff)
Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-merge
Diffstat (limited to 'indra/newview/llfloaternamedesc.h')
0 files changed, 0 insertions, 0 deletions