phoenix-firestorm/indra/media_plugins
Ansariel a831237e29 Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer
# Conflicts:
#	indra/llimage/llimage.cpp
#	indra/llimage/llimage.h
#	indra/llkdu/llimagej2ckdu.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfavoritesbar.cpp
#	indra/newview/llfloaterpreference.cpp
#	indra/newview/llfloaterpreference.h
#	scripts/messages/message_template.msg.sha1
2024-02-06 17:58:20 +01:00
..
base Switch to target_include_directories 2022-04-17 18:04:57 +02:00
cef Merge branch 'DRTVWR-600-maint-A' of https://github.com/secondlife/viewer 2024-02-06 17:58:20 +01:00
example Merge branch 'DRTVWR-568_cmake' of https://bitbucket.org/lindenlab/viewer 2022-09-17 23:12:34 +02:00
gstreamer010 Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled 2022-09-20 19:29:39 +02:00
gstreamer10 Linux: Update various 3p libraries 2023-04-02 23:07:44 +10:00
libvlc Linux - make it compile on linux, gstreamer 0.1 for now, needs to be moved to 1.0, cef probably fails when compiled with volume catcher enabled 2022-09-20 19:29:39 +02:00
CMakeLists.txt Linux: Initial work to fix broken build, restore gstreamer 1.0 2023-03-23 21:56:53 +11:00