Ansariel 73e5615d43 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # indra/llimagej2coj/llimagej2coj.cpp # indra/newview/VIEWER_VERSION.txt # indra/newview/app_settings/shaders/class1/deferred/skyF.glsl # indra/newview/app_settings/shaders/class1/deferred/skyV.glsl # indra/newview/app_settings/shaders/class2/deferred/skyF.glsl # indra/newview/llsettingsvo.cpp		2023-02-03 11:11:13 +01: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 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2023-02-03 11:11:13 +01: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