diff options
author | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:36:39 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-05-04 09:36:39 -0400 |
commit | 3b79c9c81dc1ba4cb92f1ac54bd74a57e6d5aa05 (patch) | |
tree | cf27e69ff2bea8c621d1073172636146b8c73a57 /indra/newview/skins/default/xui/fr/floater_display_name.xml | |
parent | c3df5f5d675abd107e1f0b4e3fb262226978ddb5 (diff) | |
parent | b9bb792c478d703c6442351ecb563c0a67f77111 (diff) |
merge changes for viewer-development before mesh merge
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_display_name.xml')
0 files changed, 0 insertions, 0 deletions