livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel 68e5f326b3 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 
# Conflicts:
#	.gitignore
#	indra/cmake/00-Common.cmake
#	indra/cmake/CMakeLists.txt
#	indra/cmake/GLEXT.cmake
#	indra/cmake/LLCommon.cmake
#	indra/cmake/LLMath.cmake
#	indra/cmake/LLRender.cmake
#	indra/cmake/Tracy.cmake
#	indra/llprimitive/CMakeLists.txt
#	indra/llrender/llglheaders.h
#	indra/llrender/llglslshader.cpp
#	indra/newview/VIEWER_VERSION.txt
#	indra/newview/llface.cpp
#	indra/newview/lltexturefetch.h
#	indra/newview/llviewerobjectlist.cpp
#	indra/newview/llviewertexturelist.cpp
#	indra/newview/llvopartgroup.cpp
#	indra/newview/llxmlrpctransaction.cpp
 		2023-03-31 18:54:16 +02:00
..
cmake Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +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/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llaudio
…
llcharacter Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-568 2023-03-21 10:57:56 +01:00
llcommon Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llcorehttp Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llcrashlogger Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llfilesystem Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llimage Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llimagej2coj Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llinventory Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llkdu Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llmath Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llmeshoptimizer
…
llmessage Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +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/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llrender Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llui Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llwindow Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
llxml
…
mac_crash_logger
…
media_plugins Linux: Initial work to fix broken build, restore gstreamer 1.0 2023-03-23 21:56:53 +11:00
newview Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
test Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2023-03-31 18:54:16 +02:00
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt
…
Version
…
edit-me-to-trigger-new-build.txt
…
fix-incredibuild.py
…