Ansariel 67081f9728 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # doc/contributions.txt # indra/newview/llfloater360capture.cpp		2022-12-12 22:09:54 +01:00
..
class1	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-12-12 22:09:54 +01:00
class2	…
class3	…
shader_hierarchy.txt	…