phoenix-firestorm/indra/media_plugins/cef
Ansariel 4ba5497928 Merge remote-tracking branch 'LL/DRTVWR-600-maint-A'
# Conflicts:
#	FIRESTORM-SOURCE_LICENSE_HEADER.txt
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llaudio/llaudioengine_fmodstudio.h
#	indra/llaudio/lllistener_fmodstudio.cpp
#	indra/llaudio/lllistener_fmodstudio.h
#	indra/llaudio/llstreamingaudio_fmodstudio.cpp
#	indra/llaudio/llstreamingaudio_fmodstudio.h
#	indra/llcharacter/llmultigesture.h
#	indra/llcommon/llprofiler.cpp
#	indra/llimage/llimageworker.cpp
#	indra/media_plugins/cef/dummy_volume_catcher.cpp
#	indra/newview/CMakeLists.txt
#	indra/newview/fsslurlcommand.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llavatarpropertiesprocessor.cpp
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llfloaterprofiletexture.cpp
#	indra/newview/llfloaterprofiletexture.h
#	indra/newview/llgesturemgr.h
#	indra/newview/llpanelprofile.cpp
#	indra/newview/llpanelprofile.h
#	indra/newview/llpreviewgesture.cpp
#	indra/newview/llpreviewtexture.cpp
#	indra/newview/llvoavatar.cpp
#	indra/newview/pieseparator.cpp
2024-05-22 23:53:27 +02:00
..
CMakeLists.txt Linux: take out glib dependency from volume catcher, restore cef functionality, some cmake cleanup by PorkChop 2023-04-04 05:38:46 +02:00
linux_volume_catcher.cpp Merge remote-tracking branch 'LL/marchcat/x-ws-merge' 2024-05-01 12:30:57 +02:00
linux_volume_catcher_pa_syms.inc Fix Linux volume catcher 2024-03-31 02:51:38 -04:00
linux_volume_catcher_paglib_syms.inc Linux: take out glib dependency from volume catcher, restore cef functionality, some cmake cleanup by PorkChop 2023-04-04 05:38:46 +02:00
mac_volume_catcher.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
mac_volume_catcher_null.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
media_plugin_cef.cpp Fix line endlings 2024-05-22 22:40:26 +03:00
volume_catcher.h #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
windows_volume_catcher.cpp #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00