diff options
| author | angela <angela@lindenlab.com> | 2009-11-12 23:02:41 +0800 |
|---|---|---|
| committer | angela <angela@lindenlab.com> | 2009-11-12 23:02:41 +0800 |
| commit | b4a3b65a602ad56baf761a8426093eda585bc572 (patch) | |
| tree | 9e04603d13e5f4c8a137c6b27af596b8cfe5e4d4 /indra/newview/skins/default/xui/ja/floater_critical.xml | |
| parent | f9646bd759f87012fcf59c9ca5822490ec196666 (diff) | |
fix merge error
Diffstat (limited to 'indra/newview/skins/default/xui/ja/floater_critical.xml')
0 files changed, 0 insertions, 0 deletions