phoenix-firestorm/indra
Andrey Lihatskiy ee49b3b045 Merge branch 'main' into marchcat/c-merge
# Conflicts:
#	indra/newview/llviewermenufile.cpp
2024-06-11 01:21:42 +03:00
..
cmake Merge remote-tracking branch 'origin/main' into release/materials_featurette 2024-05-28 14:24:18 -07: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 #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
lib/python/indra #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
linux_crash_logger #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
llappearance viewer#1568 Revert "SL-17597 AV height in Shape dialog IS WRONG" 2024-05-29 11:05:22 +03:00
llaudio #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
llcharacter Merge branch 'main' into release/maint-c 2024-05-15 12:27:46 +03:00
llcommon Merge branch 'main' into marchcat/c-merge 2024-06-11 01:21:42 +03:00
llcorehttp #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
llcrashlogger #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
llfilesystem #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
llimage #1457 Fix the tests on mac 2024-05-15 09:35:28 -04:00
llimagej2coj #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
llinventory Merge branch 'main' into marchcat/x-mf-merge 2024-05-15 12:51:21 +03:00
llkdu #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
llmath Post-merge spaces fix 2024-05-15 12:47:27 +03: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 #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
llplugin Post-merge spaces fix 2024-05-15 12:47:27 +03:00
llprimitive Merge branch 'main' into marchcat/x-mf-merge 2024-05-15 12:51:21 +03:00
llrender viewer#1520 Material upload floater displays wrong upload fee 2024-05-21 10:11:44 +03:00
llui viewer-private#240 Restore missing marketplace notification 2024-05-23 19:49:10 +03:00
llwindow Merge branch 'main' into release/maint-c 2024-05-15 12:27:46 +03:00
llxml Merge branch 'marchcat/w-whitespace' into marchcat/x-ws-merge 2024-05-01 08:16:58 +03:00
media_plugins #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
newview Merge branch 'main' into marchcat/c-merge 2024-06-11 01:21:42 +03:00
test #1457 Fix the tests on mac 2024-05-15 09:35:28 -04:00
tools/vstool
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
CMakeLists.txt
edit-me-to-trigger-new-build.txt