phoenix-firestorm/indra
Ansariel 719a2d31dc Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llui/llscrolllistctrl.h
#	indra/newview/CMakeLists.txt
#	indra/newview/llviewerfloaterreg.cpp
#	indra/newview/skins/default/textures/textures.xml
2023-04-22 12:02:23 +02:00
..
cmake Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-04-22 12:02:23 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra
linux_crash_logger
llappearance Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-04-05 10:56:12 +02:00
llaudio
llcharacter Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-04-05 11:56:57 +02:00
llcommon Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-04-22 12:02:23 +02:00
llcorehttp Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-04-05 10:56:12 +02:00
llcrashlogger
llfilesystem const ref please! 2023-04-04 13:16:14 +02:00
llimage Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-04-05 10:56:12 +02:00
llimagej2coj
llinventory Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-04-05 10:56:12 +02:00
llkdu
llmath Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-04-05 11:56:57 +02:00
llmeshoptimizer
llmessage Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-04-05 11:56:57 +02:00
llplugin
llprimitive
llrender Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-04-05 11:56:57 +02:00
llui Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-04-22 12:02:23 +02:00
llwindow
llxml Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-04-05 11:56:57 +02:00
mac_crash_logger
media_plugins Linux: take out glib dependency from volume catcher, restore cef functionality, some cmake cleanup by PorkChop 2023-04-04 05:38:46 +02:00
newview Merge branch 'DRTVWR-489' of https://github.com/secondlife/viewer 2023-04-22 12:02:23 +02:00
test
tools
viewer_components
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt
fix-incredibuild.py