diff options
author | Nat Goodspeed <nat@lindenlab.com> | 2018-04-11 08:39:10 -0400 |
---|---|---|
committer | Nat Goodspeed <nat@lindenlab.com> | 2018-04-11 08:39:10 -0400 |
commit | e9f1db15ccc1f1dc02f8cffb1afeacb759b8eae9 (patch) | |
tree | 1ff33116e55c3bbee16f7cd64a56b710491f4284 /indra/newview/skins/default/xui/es/floater_picks.xml | |
parent | f82548b931af69a08d53818ec7a96a967c05151c (diff) | |
parent | 12ccb65603ec50ac80d85c4e023ec8e026c9e1f2 (diff) |
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to 'indra/newview/skins/default/xui/es/floater_picks.xml')
0 files changed, 0 insertions, 0 deletions