Ansariel ef88337eef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm ... # Conflicts: # autobuild.xml # doc/contributions.txt # indra/llcommon/tests/llprocess_test.cpp # indra/newview/lldrawpoolavatar.cpp # indra/newview/llfloatermodelpreview.cpp # indra/newview/llmodelpreview.cpp # indra/newview/llviewertexturelist.cpp # indra/newview/llvovolume.cpp # indra/newview/viewer_manifest.py		2022-03-02 10:12:19 +01:00
..
base	Move pulse header detection.	2022-02-01 17:44:51 +01:00
cef	Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm	2022-03-02 10:12:19 +01:00
example	…
gstreamer010	…
gstreamer10	Bring back gstreamer, remove the old and unmaintained Linux VLC version.	2022-02-20 21:24:37 +01:00
libvlc	Merge branch 'DRTVWR-545-maint-mix' of https://bitbucket.org/lindenlab/viewer	2021-11-10 21:21:51 +01:00
CMakeLists.txt	Bring back gstreamer, remove the old and unmaintained Linux VLC version.	2022-02-20 21:24:37 +01:00