phoenix-firestorm/indra
Andrey Lihatskiy 033b04f388 Merge branch 'main' into DRTVWR-582-maint-U
# Conflicts:
#	indra/newview/llagentlistener.cpp
#	indra/newview/llcommanddispatcherlistener.cpp
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llworldmapview.cpp
2023-05-17 18:05:05 +03:00
..
cmake Merge branch 'main' into DRTVWR-577-maint-S 2023-05-02 17:39:37 +03:00
copy_win_scripts
doxygen
integration_tests Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R 2023-03-20 01:23:16 +02:00
lib/python/indra
linux_crash_logger
llappearance Merge branch 'main' into marchcat/main-contrib-merge 2023-04-07 00:20:59 +03:00
llaudio Merge branch 'contribute' into DRTVWR-582-maint-U 2023-04-11 00:15:27 +03:00
llcharacter Merge branch 'main' into marchcat/main-contrib-merge 2023-04-07 00:20:59 +03:00
llcommon Merge branch 'main' into DRTVWR-582-maint-U 2023-05-17 18:05:05 +03:00
llcorehttp Merge branch 'main' into marchcat/main-contrib-merge 2023-04-07 00:20:59 +03:00
llcrashlogger
llfilesystem Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R 2023-03-20 01:23:16 +02:00
llimage Merge branch 'main' into marchcat/main-contrib-merge 2023-04-07 00:20:59 +03:00
llimagej2coj Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R 2023-03-20 01:23:16 +02:00
llinventory SL-19660 Merge pull request #199 from beqjanus/main 2023-05-09 17:55:00 +03:00
llkdu
llmath Merge branch 'main' into marchcat/main-contrib-merge 2023-04-07 00:20:59 +03:00
llmeshoptimizer
llmessage Merge branch 'main' into DRTVWR-582-maint-U 2023-05-17 18:05:05 +03:00
llplugin Merge branch 'DRTVWR-568' into DRTVWR-573-maint-R 2023-03-20 01:23:16 +02:00
llprimitive Merge branch 'main' into marchcat/main-contrib-merge 2023-04-07 00:20:59 +03:00
llrender
llui Merge branch 'main' into DRTVWR-577-maint-S 2023-05-02 17:39:37 +03:00
llwindow Merge branch 'main' into DRTVWR-577-maint-S 2023-05-02 17:39:37 +03:00
llxml
media_plugins
newview Merge branch 'main' into DRTVWR-582-maint-U 2023-05-17 18:05:05 +03:00
test SL-19647: Eliminate LLSDArray entirely. 2023-05-03 17:38:30 -04:00
tools/vstool
viewer_components
win_crash_logger
CMakeLists.txt
edit-me-to-trigger-new-build.txt retrigger build 2023-02-28 11:35:44 +02:00
fix-incredibuild.py