diff options
author | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-08-26 17:14:22 -0700 |
---|---|---|
committer | Matthew Breindel (Falcon) <falcon@lindenlab.com> | 2010-08-26 17:14:22 -0700 |
commit | 72ad2e656e4b8db83995b77a627ecb214b7abb3e (patch) | |
tree | e9efc96828f988c2a272a9b2736023b73a5b8e6c /indra/newview/skins/default/xui/fr | |
parent | 9db7d6cb3d216fcdc1b6528039dc6538b045819e (diff) |
Fixed bad merge.
Diffstat (limited to 'indra/newview/skins/default/xui/fr')
0 files changed, 0 insertions, 0 deletions