Ansariel eaa5dc798c Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-atlasaurus ... # Conflicts: # indra/newview/llfloaterregioninfo.cpp # indra/newview/llversioninfo.cpp # indra/newview/llviewertexturelist.cpp		2024-07-30 10:45:11 +02:00
..
testplans	Merge pull request #1982 from secondlife/v-1885	2024-07-10 15:47:31 -07:00
FS_PR_GUIDELINES.md	Move PR guidelines doc to doc folder	2024-07-27 12:00:44 +02:00
LGPL-license.txt	…
LICENSE-logos.txt	…
LICENSE-source.txt	…
building_linux.md	…
building_macos.md	…
building_windows.md	…
contributions.txt	…
firestorm_256.png	…
translations.txt	…