phoenix-firestorm/indra
Ansariel 137f5d145e Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	indra/newview/llagentlistener.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llcommanddispatcherlistener.cpp
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llworldmapview.cpp
2023-05-18 14:03:52 +02:00
..
cmake Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-17 18:05:14 +02:00
copy_win_scripts
doxygen
integration_tests Merge branch 'DRTVWR-573-maint-R' of https://github.com/secondlife/viewer 2023-03-21 11:32:38 +01:00
lib/python/indra
linux_crash_logger Linux: Restore crashreporting (hopefully) 2023-03-31 00:05:29 +11:00
llappearance Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute 2023-04-21 12:38:19 +02:00
llaudio Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer 2023-04-21 14:22:42 +02:00
llcharacter Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute 2023-04-21 12:38:19 +02:00
llcommon Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-18 14:03:52 +02:00
llcorehttp Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute 2023-04-21 12:38:19 +02:00
llcrashlogger
llfilesystem const ref please! 2023-04-04 13:16:14 +02:00
llimage Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute 2023-04-21 12:38:19 +02:00
llimagej2coj Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 2023-03-21 10:57:56 +01:00
llinventory Merge branch 'main' of https://github.com/secondlife/viewer 2023-05-17 18:05:52 +02:00
llkdu
llmath Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute 2023-04-21 12:38:19 +02:00
llmeshoptimizer
llmessage Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute 2023-04-21 12:38:19 +02:00
llplugin Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 2023-03-21 10:57:56 +01:00
llprimitive Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-contribute 2023-04-21 12:38:19 +02:00
llrender Remove stray comment marker, oops! 2023-04-03 05:30:49 +02:00
llui Merge branch 'main' into DRTVWR-577-maint-S 2023-05-02 17:39:37 +03:00
llwindow Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-02 17:52:00 +02:00
llxml
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 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-05-18 14:03:52 +02:00
test Merge branch 'DRTVWR-577-maint-S' of https://github.com/secondlife/viewer 2023-05-05 09:44:21 +02:00
tools
viewer_components
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt retrigger build 2023-02-28 11:35:44 +02:00
fix-incredibuild.py