phoenix-firestorm/doc
Andrey Kleshchev 3d73a10da3 Merge branch main (DRTVWR-582) into DRTVWR-567
# Conflicts:
#	indra/newview/app_settings/settings.xml
#	indra/newview/llinventoryfunctions.cpp
#	indra/newview/llinventoryfunctions.h
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llinventoryobserver.cpp
#	indra/newview/llinventoryobserver.h
#	indra/newview/skins/default/xui/ja/floater_inventory_item_properties.xml
2023-08-23 22:40:17 +03:00
..
LGPL-license.txt
LICENSE-logos.txt
LICENSE-source.txt
contributions.txt Merge branch main (DRTVWR-582) into DRTVWR-567 2023-08-23 22:40:17 +03:00
releasenotes-where.txt
sl-logo-dark.png
sl-logo.png
translations.txt