phoenix-firestorm/indra/media_plugins
Andrey Lihatskiy 469ce7f7f6 Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK
# Conflicts:
#	indra/newview/app_settings/key_bindings.xml
#	indra/newview/llappviewer.cpp
#	indra/newview/llkeyconflict.cpp
2022-01-10 23:51:52 +02:00
..
base
cef Merge branch 'DRTVWR-530-maint' into DRTVWR-553-maint-mix-JK 2022-01-10 23:51:52 +02:00
example
gstreamer010
libvlc SL-16333 VLC 3 doesn't support -1 == infinity for input-repeat 2021-11-09 02:38:58 +02:00
CMakeLists.txt