diff options
author | Andrew A. de Laix <alain@lindenlab.com> | 2011-06-20 15:48:08 -0700 |
---|---|---|
committer | Andrew A. de Laix <alain@lindenlab.com> | 2011-06-20 15:48:08 -0700 |
commit | 7b33ae4456c4d66770aa2df86094db57f25505f8 (patch) | |
tree | 578d851b0525ce0da5adfcfd5c5f7b314f56780f /indra/newview/skins/default/xui/en/floater_texture_ctrl.xml | |
parent | 7f6d49df43c660b9f5632ffb8a30f90ee718cac0 (diff) | |
parent | 0fb93246b36b356362e1899eab2d67c8931d9471 (diff) |
Automated merge with http://hg.secondlife.com/viewer-development
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_texture_ctrl.xml')
0 files changed, 0 insertions, 0 deletions