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 Fix spelling error on license file name 2022-11-18 06:23:11 -05:00
LICENSE-logos.txt merge buildcleanup 2015-06-25 12:13:10 -04:00
LICENSE-source.txt merge buildcleanup 2015-06-25 12:13:10 -04:00
contributions.txt Merge branch main (DRTVWR-582) into DRTVWR-567 2023-08-23 22:40:17 +03:00
releasenotes-where.txt Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00
sl-logo-dark.png Fix readme logo for dark theme sites 2022-11-18 06:22:43 -05:00
sl-logo.png SL-14702: Spruce up README 2021-08-02 10:10:14 -07:00
translations.txt Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07:00