diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-28 11:39:28 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-05-28 11:39:28 -0400 |
commit | 7983de22074beb25a832f89aa3e7a9728baca328 (patch) | |
tree | 4812d1e655e8c4c3c48c00dbefa79b62cafe20ce /indra/newview/skins/default/xui/fr/floater_joystick.xml | |
parent | 955698c7a6d04c1ed895bfc2b9b5acf4e8d5473e (diff) | |
parent | e07deaa3dac6b9bc651034543c174e974b4b9ad2 (diff) |
Automated merge with ssh://hg.lindenlab.com/dessie/viewer-public
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_joystick.xml')
0 files changed, 0 insertions, 0 deletions