summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerdisplayname.cpp
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-01-13 09:58:47 -0500
committerOz Linden <oz@lindenlab.com>2012-01-13 09:58:47 -0500
commitf6b8bfd3da163d275400035b24a969e5147c6352 (patch)
tree449fda9ad8f4628e0b1dfac31068a9a5d943a7af /indra/newview/llviewerdisplayname.cpp
parent6aa48f31c9af1f46335aa64648cda77912aa391d (diff)
parent4405910caa34446a19f66cfc35a9270a0e14292f (diff)
merge changes for vmrg-215
Diffstat (limited to 'indra/newview/llviewerdisplayname.cpp')
0 files changed, 0 insertions, 0 deletions