diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 08:57:27 +0000 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-02-24 08:57:27 +0000 |
| commit | a7bca7055adbceee0fe09a6078158ffe8d0eacef (patch) | |
| tree | 4facac85effad80ad3d185794edc2ae90bddac1e /indra/newview/skins/default/xui/fr/floater_god_tools.xml | |
| parent | 245fe3edc6fa7333c16efcc90a4a52db8450a828 (diff) | |
| parent | 1d45b1edcd3570b27622c0e99cf0bd5aee331cc1 (diff) | |
PE merge. Conflict resolved.
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_god_tools.xml')
0 files changed, 0 insertions, 0 deletions