diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-04 00:17:55 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2022-08-04 00:17:55 +0300 |
| commit | 59ab8e78f42a9fcbd0da771c3ab2ed821e84c5e4 (patch) | |
| tree | faa3da3f5304cca9e529e02d6ee4053274d53a41 /indra/newview/skins/default/xui/ja/strings.xml | |
| parent | 3f6c9e2f7a8e1801fefe81f5f740501fda7dba69 (diff) | |
| parent | 9dba9f80f4d40ec12a735ddbb66a9d103a959ece (diff) | |
Merge branch 'master' into DRTVWR-544-maint
# Conflicts:
# indra/newview/llpanelface.cpp
# indra/newview/llpanelface.h
# indra/newview/llpanelobject.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/ja/strings.xml')
0 files changed, 0 insertions, 0 deletions