livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
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
..
cmake Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
copy_win_scripts
…
doxygen
…
integration_tests Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
lib/python/indra
…
linux_crash_logger
…
llappearance Merge branch 'release/2025.05' of https://github.com/secondlife/viewer 2025-07-18 14:14:54 +02:00
llaudio Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llcharacter Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm-develop 2025-08-06 18:47:44 +02:00
llcommon Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llcorehttp Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llcrashlogger Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llfilesystem Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llimage Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llimagej2coj Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llinventory Merge branch 'release/2025.06' of https://github.com/secondlife/viewer 2025-08-06 19:07:19 +02:00
llkdu Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llmath Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llmeshoptimizer
…
llmessage Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llplugin Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llprimitive Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llrender Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llui Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llwebrtc Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llwindow Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
llxml Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
mac_crash_logger
…
media_plugins Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
newview Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
test Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
tools/manifests Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-16 12:38:56 +02:00
viewer_components
…
win_crash_logger Merge branch 'develop' of https://github.com/secondlife/viewer 2025-08-16 12:38:56 +02:00
CMakeLists.txt Merge branch 'project/mac_universal' of https://github.com/secondlife/viewer 2025-09-05 14:55:37 +02:00
Version
…