phoenix-firestorm/indra/media_plugins
Andrey Kleshchev 97a103255e Merge branch 'master' (DRTVWR-557) into DRTVWR-546
# Conflicts:
#	autobuild.xml
#	doc/contributions.txt
#	indra/cmake/GLOD.cmake
#	indra/llcommon/tests/llprocess_test.cpp
#	indra/newview/VIEWER_VERSION.txt
#	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-01 13:41:42 +02: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' (DRTVWR-557) into DRTVWR-546 2022-03-01 13:41:42 +02:00
example SL-3704 Plugin exit issues 2019-07-01 17:28:58 +03:00
gstreamer010 remove only-partially-successful attempt to put teamcity blocks around targets 2018-09-07 09:13:57 -04:00
libvlc SL-16333 VLC 3 doesn't support -1 == infinity for input-repeat 2021-11-09 02:38:58 +02:00
CMakeLists.txt