Ansariel 07228d3a9e Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/cmake/CURL.cmake # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FreeType.cmake # indra/cmake/LLPrimitive.cmake # indra/cmake/NGHTTP2.cmake # indra/cmake/Tracy.cmake # indra/llappearance/llavatarappearancedefines.cpp # indra/llcommon/llprofiler.cpp # indra/llcommon/llprofiler.h # indra/llfilesystem/lldiskcache.cpp # indra/llfilesystem/lldiskcache.h # indra/llinventory/llinventorytype.cpp # indra/media_plugins/example/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/installers/windows/installer_template.nsi # indra/newview/llappearancemgr.cpp # indra/newview/llappviewer.cpp # indra/newview/llgroupmgr.cpp # indra/newview/llimprocessing.cpp # indra/newview/llviewermenu.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvoavatar.cpp # indra/newview/llvoavatarself.cpp # indra/newview/skins/default/xui/en/menu_viewer.xml # indra/newview/viewer_manifest.py		2024-08-15 00:12:13 +02:00
..
darwin	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-07-02 01:23:35 +02:00
linux	Do not copy all 32 bit dynamic sos as this causes problems with output device enumeration.	2022-04-03 17:52:20 +02:00
windows	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-15 00:12:13 +02:00