phoenix-firestorm/indra
Ansariel fde4d3eba0 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm
# Conflicts:
#	indra/newview/llviewertexture.cpp
2024-07-16 11:33:38 +02:00
..
cmake Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
copy_win_scripts
doxygen
integration_tests
lib/python/indra Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
linux_crash_logger
llappearance Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-11 20:25:22 +02:00
llaudio
llcharacter
llcommon Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-07-16 11:33:38 +02:00
llcorehttp Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-06-11 15:47:42 +02:00
llcrashlogger
llfilesystem Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llimage Fix texture fetch request getting canceled if request counter flips over 2024-06-22 14:53:16 +02:00
llimagej2coj Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-06-10 21:53:31 +02:00
llinventory Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llkdu
llmath Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llmeshoptimizer
llmessage Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llplugin Merge branch 'master' of https://bitbucket.org/Ansariel/phoenix-firestorm-600 2024-06-13 01:54:18 +02:00
llprimitive Merge branch 'project/gltf_development' of https://github.com/secondlife/viewer 2024-06-13 03:21:12 +02:00
llrender Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 22:45:12 +02:00
llui Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-07-10 10:31:35 +02:00
llwebrtc Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llwindow Merge branch 'develop' of https://github.com/secondlife/viewer 2024-06-21 19:46:51 +02:00
llxml
mac_crash_logger
media_plugins
newview Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm 2024-07-16 11:33:38 +02:00
test
tools
viewer_components
win_crash_logger
CMakeLists.txt
Version
edit-me-to-trigger-new-build.txt