livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
phoenix-firestorm/indra
History
Ansariel 6ccdf5545d Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 
# Conflicts:
#	autobuild.xml
#	indra/llcommon/CMakeLists.txt
#	indra/llrender/llgl.cpp
#	indra/newview/llappviewer.cpp
#	indra/newview/llface.cpp
#	indra/newview/llflexibleobject.cpp
#	indra/newview/llvovolume.cpp
 		2022-05-27 11:41:45 +02:00
..
cmake Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
copy_win_scripts
…
doxygen
…
integration_tests
…
lib/python/indra Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
linux_crash_logger
…
llappearance Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llaudio Make SDL2 a cmake option, use SDL2 Mixer for audio playback, this might open a good way to a full open source way (no FModStudio needed). But here be dragons still. 2022-04-25 21:24:29 +02:00
llcharacter Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-01-15 02:39:07 +01:00
llcommon Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llcorehttp Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llcrashlogger
…
llfilesystem
…
llimage Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llimagej2coj
…
llinventory Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llkdu
…
llmath Merge branch 'DRTVWR-546' of https://bitbucket.org/lindenlab/viewer 2022-05-10 19:14:02 +02:00
llmeshoptimizer
…
llmessage Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2022-05-10 19:10:53 +02:00
llplugin Merge branch 'DRTVWR-543-maint' of https://bitbucket.org/lindenlab/viewer 2022-05-05 10:00:17 +02:00
llprimitive Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llrender Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llui Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llwindow Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
llxml
…
mac_crash_logger
…
media_plugins
…
newview Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
test
…
tools
…
viewer_components
…
win_crash_logger
…
CMakeLists.txt Merge branch 'master' of https://vcs.firestormviewer.org/viewer-merges/phoenix-firestorm-546 2022-05-27 11:41:45 +02:00
Version
…
edit-me-to-trigger-new-build.txt
…
fix-incredibuild.py
…