diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-05-28 14:08:38 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-05-28 14:08:38 -0400 |
commit | b7bfc3ae7a7934676b217e0c1fe24ce821ab4649 (patch) | |
tree | 4bfac8f82f69738d15d71693c8938f62e2c59f66 /indra/newview/skins/default/xui/fr/floater_bumps.xml | |
parent | 0b96ae29cf0b2baf4732e09a28a5f76d3df05727 (diff) | |
parent | 7983de22074beb25a832f89aa3e7a9728baca328 (diff) |
automated merge
Diffstat (limited to 'indra/newview/skins/default/xui/fr/floater_bumps.xml')
0 files changed, 0 insertions, 0 deletions