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
..
base	#824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed	2024-04-29 07:56:09 +03:00
cef	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-15 00:12:13 +02:00
example	Update zlib-ng libxml2 libpng freetype minizip-ng boost collada-dom tinygltf packages (#2250)	2024-08-12 07:30:42 +03:00
gstreamer010	Merge remote-tracking branch 'LL/marchcat/x-ws-merge'	2024-05-01 12:30:57 +02:00
gstreamer10	Merge remote-tracking branch 'LL/marchcat/x-ws-merge'	2024-05-01 12:30:57 +02:00
libvlc	Merge branch 'develop' of https://github.com/secondlife/viewer	2024-08-15 00:12:13 +02:00
CMakeLists.txt	Linux: Initial work to fix broken build, restore gstreamer 1.0	2023-03-23 21:56:53 +11:00