phoenix-firestorm/indra
Ansariel 76f2b1f48c Merge branch 'develop' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/newview/llfloaterspellchecksettings.h
#	indra/newview/llpaneleditwearable.cpp
#	indra/newview/llviewertexture.cpp
#	indra/newview/llviewertexture.h
2024-07-16 10:44:38 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-02 18:08:57 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llaudio Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llcharacter Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llcommon Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-16 10:44:38 +02:00
llcorehttp Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llcrashlogger Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llfilesystem Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llimage Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llimagej2coj Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llinventory Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llkdu
llmath Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-16 10:44:38 +02:00
llmeshoptimizer Update meshoptimizer package to 0.21 (#1948) 2024-07-09 19:51:38 -05:00
llmessage Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llplugin
llprimitive Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
llrender Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-10 12:36:15 +02:00
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-07-10 10:31:35 +02:00
llwebrtc Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-02 18:08:57 +02:00
llwindow Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-16 10:44:38 +02:00
llxml Fix build error in llxmlnode.cpp 2024-07-09 07:58:13 +03:00
mac_crash_logger
media_plugins Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-09 02:25:42 +02:00
newview Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-16 10:44:38 +02:00
test Merge branch 'develop' of https://github.com/secondlife/viewer 2024-07-10 12:36:15 +02:00
tools
viewer_components #1111 Remove xmlrpc-epi 2024-07-01 20:20:04 +02:00
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt