phoenix-firestorm/doc
Andrey Kleshchev 7373fd91fa Merge remote-tracking branch 'origin/main' into DRTVWR-489
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llmath/llvolume.cpp
#	indra/llrender/llgl.cpp
#	indra/llxml/llcontrol.cpp
#	indra/newview/llpanelnearbymedia.cpp
#	indra/newview/llsceneview.cpp
#	indra/newview/llselectmgr.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/lltextureview.cpp
#	indra/newview/llvovolume.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
2023-08-24 01:23:52 +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 remote-tracking branch 'origin/main' into DRTVWR-489 2023-08-24 01:23:52 +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