diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-03 19:46:29 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-10-03 19:55:49 +0300 |
| commit | 878fb36a0bb632f5e541b132a7ded5eb047ff947 (patch) | |
| tree | 9280a9ce33ddec5e186526077c7edcba2f6fe736 /indra/newview/skins/default/xui/en/floater_notification.xml | |
| parent | bcfd5d5279f1796abaf347d2276d2a0b9983f35e (diff) | |
| parent | 2465470817957c8378e81ec1a7e32551fbac7b26 (diff) | |
Merge branch 'main' into DRTVWR-591-maint-X
# Conflicts:
# indra/newview/app_settings/settings.xml
# indra/newview/llinventorybridge.cpp
# indra/newview/lltexturectrl.h
# indra/newview/llvovolume.cpp
Diffstat (limited to 'indra/newview/skins/default/xui/en/floater_notification.xml')
0 files changed, 0 insertions, 0 deletions