phoenix-firestorm/doc
Ansariel 2aceea66ff Merge branch 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llcommon/llsdserialize.cpp
#	indra/llmath/llvolume.cpp
#	indra/llmath/llvolume.h
#	indra/newview/llfloateropenobject.cpp
#	indra/newview/llfloateropenobject.h
#	indra/newview/llmaterialmgr.cpp
#	indra/newview/llmeshrepository.cpp
#	indra/newview/llmeshrepository.h
#	indra/newview/skins/default/xui/en/floater_openobject.xml
2022-10-01 13:10:39 +02:00
..
LGPL-licence.txt Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07: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 'DRTVWR-570-maint-Q' of https://bitbucket.org/lindenlab/viewer 2022-10-01 13:10:39 +02:00
releasenotes-where.txt Update Mac and Windows breakpad builds to latest 2013-03-29 07:50:08 -07: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