diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 00:54:35 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2021-06-25 00:54:35 +0300 |
| commit | 7f19c512c9593dd925467a2bc75ad4cf0c3dbca9 (patch) | |
| tree | 45a84ad8de373e0f68963d6685df4683dff09430 /indra/newview/skins/default/xui/ja/panel_tools_texture.xml | |
| parent | 88ac2812b421f1eb5ab2af6fb793b23025da29a4 (diff) | |
| parent | 467d8339c970c253dada2cf0e1eed45be66593ac (diff) | |
Merge branch 'master' into DRTVWR-522-maint
# Conflicts:
# indra/newview/app_settings/settings.xml
Diffstat (limited to 'indra/newview/skins/default/xui/ja/panel_tools_texture.xml')
0 files changed, 0 insertions, 0 deletions