summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterdisplayname.cpp
diff options
context:
space:
mode:
authorprep <prep@lindenlab.com>2013-03-12 18:53:27 -0400
committerprep <prep@lindenlab.com>2013-03-12 18:53:27 -0400
commit0ebcdce82bffae18459ed541f05906f625ef47e2 (patch)
treec142cc432afa991a5fce0c6d17625aa1ad53cdec /indra/newview/llfloaterdisplayname.cpp
parent34fe6ad59161e0dcd57dfdc1feb6cfd1fcaa4794 (diff)
WIP: merge fixes
Diffstat (limited to 'indra/newview/llfloaterdisplayname.cpp')
0 files changed, 0 insertions, 0 deletions