Ansariel 6663bc6f85 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # autobuild.xml # indra/llfilesystem/llfilesystem.cpp # indra/newview/CMakeLists.txt # indra/newview/llappviewer.cpp # indra/newview/lldrawpoolavatar.cpp # indra/newview/llviewercontrol.cpp		2021-12-16 09:49:35 +01: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 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2021-12-16 09:49:35 +01: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