phoenix-firestorm/indra/media_plugins
Ansariel 6663bc6f85 Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm
# Conflicts:
#	autobuild.xml
#	indra/llfilesystem/llfilesystem.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/llappviewer.cpp
#	indra/newview/lldrawpoolavatar.cpp
#	indra/newview/llviewercontrol.cpp
2021-12-16 09:49:35 +01:00
..
base remove only-partially-successful attempt to put teamcity blocks around targets 2018-09-07 09:13:57 -04:00
cef Merge branch 'master' of https://vcs.firestormviewer.org/phoenix-firestorm 2021-12-16 09:49:35 +01:00
example Merge viewer-neko 2019-08-04 12:09:33 +02:00
gstreamer010 Undo Linux updates. 2021-03-09 10:40:01 +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 Undo Linux updates. 2021-03-09 10:40:01 +01:00