phoenix-firestorm/indra
Ansariel b84b5bd949 Merge remote-tracking branch 'LL/release/materials_featurette'
# Conflicts:
#	doc/contributions.txt
2024-05-16 02:52:21 +02:00
..
cmake Merge remote-tracking branch 'LGPL/master' 2024-05-16 02:11:51 +02:00
copy_win_scripts #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
doxygen
integration_tests Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
lib/python/indra Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
linux_crash_logger Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llappearance Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llaudio Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llcharacter Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llcommon Merge remote-tracking branch 'LL/release/materials_featurette' 2024-05-16 02:52:21 +02:00
llcorehttp Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llcrashlogger Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llfilesystem Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llimage Merge remote-tracking branch 'LL/release/materials_featurette' 2024-05-16 02:52:21 +02:00
llimagej2coj Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llinventory Merge remote-tracking branch 'LGPL/master' 2024-05-16 02:11:51 +02:00
llkdu Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llmath Merge remote-tracking branch 'LGPL/master' 2024-05-16 02:11:51 +02:00
llmeshoptimizer #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
llmessage Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
llplugin Merge remote-tracking branch 'LGPL/master' 2024-05-16 02:11:51 +02:00
llprimitive Merge remote-tracking branch 'LL/release/materials_featurette' 2024-05-16 02:52:21 +02:00
llrender Merge remote-tracking branch 'LGPL/master' 2024-05-16 02:11:51 +02:00
llui Merge remote-tracking branch 'LGPL/master' 2024-05-16 02:11:51 +02:00
llwindow Merge remote-tracking branch 'LGPL/master' 2024-05-13 17:39:18 +02:00
llxml Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
mac_crash_logger
media_plugins Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
newview Merge remote-tracking branch 'LL/release/materials_featurette' 2024-05-16 02:52:21 +02:00
test Merge remote-tracking branch 'LL/release/materials_featurette' 2024-05-16 02:52:21 +02:00
tools
viewer_components #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
win_crash_logger Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt