diff options
author | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-30 17:27:18 -0400 |
---|---|---|
committer | Nyx (Neal Orman) <nyx@lindenlab.com> | 2010-06-30 17:27:18 -0400 |
commit | 2c6f77666e114b7b03fecede403ab7520c3c758c (patch) | |
tree | 224605718fc3265df245cab4ed0b22b6285f478a /indra/newview/skins/default/xui/en/floater_bumps.xml | |
parent | 43d51d4548916d37ec89f38d5209e20864c4885c (diff) | |
parent | b48e1bfa8eeef547a8901cc9da6cde3b782db2c2 (diff) |
Automated merge with ssh://hg.lindenlab.com/q/viewer-release/
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_bumps.xml')
0 files changed, 0 insertions, 0 deletions