phoenix-firestorm/doc
Andrey Kleshchev 7d50a51434 Merge branch 'main' (DRTVWR-567) into DRTVWR-559
# Conflicts:
#	indra/newview/CMakeLists.txt
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llagent.cpp
#	indra/newview/llfloaternewfeaturenotification.cpp
#	indra/newview/llinventorybridge.cpp
#	indra/newview/llinventorymodel.cpp
#	indra/newview/lloutfitgallery.cpp
#	indra/newview/llpanelmaininventory.cpp
#	indra/newview/llpanelmaininventory.h
#	indra/newview/llsidepaneltaskinfo.cpp
#	indra/newview/llsidepaneltaskinfo.h
#	indra/newview/lltexturectrl.cpp
#	indra/newview/lltexturectrl.h
#	indra/newview/llviewerinventory.cpp
#	indra/newview/llviewerobject.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llviewertexturelist.h
#	indra/newview/skins/default/xui/en/floater_new_feature_notification.xml
#	indra/newview/skins/default/xui/en/menu_inventory.xml
2023-10-03 19:00:33 +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-567) into DRTVWR-559 2023-10-03 19:00:33 +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