Ansariel b99cf9fb86 Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer ... # Conflicts: # autobuild.xml # indra/cmake/00-Common.cmake # indra/cmake/APR.cmake # indra/cmake/Audio.cmake # indra/cmake/Boost.cmake # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/LLKDU.cmake # indra/cmake/LLPrimitive.cmake # indra/cmake/Meshoptimizer.cmake # indra/cmake/NGHTTP2.cmake # indra/cmake/OPENAL.cmake # indra/llaudio/llvorbisencode.cpp # indra/llcommon/linden_common.h # indra/llcommon/llcommon.cpp # indra/llcommon/llfasttimer.cpp # indra/llcommon/llfasttimer.h # indra/llcommon/llfile.cpp # indra/llcommon/llmemory.h # indra/llcommon/llprofiler.h # indra/llcommon/llthreadsafequeue.h # indra/llfilesystem/lldir_win32.cpp # indra/llkdu/llimagej2ckdu.cpp # indra/llkdu/llimagej2ckdu.h # indra/llkdu/llkdumem.h # indra/llplugin/slplugin/CMakeLists.txt # indra/llrender/llfontfreetype.cpp # indra/llrender/llfontfreetype.h # indra/llwindow/CMakeLists.txt # indra/llwindow/llopenglview-objc.mm # indra/llwindow/llwindowmacosx-objc.h # indra/llwindow/llwindowwin32.cpp # indra/media_plugins/cef/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewer.cpp # indra/newview/llface.cpp # indra/newview/pipeline.cpp # indra/newview/viewer_manifest.py		2025-09-05 14:55:37 +02:00
..
CMakeLists.txt	Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer	2025-09-05 14:55:37 +02:00
media_plugin_libvlc.cpp	MacOS companion changes for dullahan 1.21 including package structure and linkage fixes	2025-08-27 23:05:40 -04:00