Andrey Lihatskiy 3da7a50b71 Merge branch 'master' into DRTVWR-543-maint ... # Conflicts: # autobuild.xml # indra/cmake/LLCommon.cmake # 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 02:51:33 +03:00
..
indra	Merge branch 'master' into DRTVWR-543-maint	2022-05-27 02:51:33 +03:00