diff options
| author | Oz Linden <oz@lindenlab.com> | 2013-03-25 16:11:04 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2013-03-25 16:11:04 -0400 |
| commit | d7e041d0c7a6f5e19b12efb434a722d6b4969b24 (patch) | |
| tree | 8e3d92d76dc38687ddbd05ad2791ed845c95fdc7 /indra/newview/skins/default/xui/ja/floater_inspect.xml | |
| parent | 1057caffaf24790be26376b2794059e7635dde7b (diff) | |
correct merge error
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_inspect.xml')
0 files changed, 0 insertions, 0 deletions