Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 ... # Conflicts: # autobuild.xml # indra/llcommon/CMakeLists.txt # indra/llrender/llgl.cpp # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/llflexibleobject.cpp # indra/newview/llvovolume.cpp		2022-05-27 11:41:45 +02:00
..
python/indra	Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546	2022-05-27 11:41:45 +02:00