Ansariel 99396c859d Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/newview/llviewerdisplay.cpp # indra/newview/llviewertexture.cpp # indra/newview/llviewertexturelist.cpp		2024-07-10 10:31:35 +02:00
..
testplans	…
LGPL-license.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
building_linux.md	fix build target name in docs RelWithDebInfo_open -> RelWithDebInfoFS_open	2024-06-22 16:37:05 +02:00
building_macos.md	…
building_windows.md	…
contributions.txt	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-06-21 19:46:51 +02:00
firestorm_256.png	…
translations.txt	…