Ansariel 63238d1fbe Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer ... # Conflicts: # indra/cmake/Copy3rdPartyLibs.cmake # indra/cmake/FMODSTUDIO.cmake # indra/newview/llappviewer.cpp # indra/newview/llviewerregion.cpp # indra/newview/viewer_manifest.py		2022-03-01 19:19:48 +01:00
..
base	Move pulse header detection.	2022-02-01 17:44:51 +01:00
cef	Linux; remove setting of proxy info till dullahan gets an update.	2022-03-01 13:20:43 +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
gstreamer10	Bring back gstreamer, remove the old and unmaintained Linux VLC version.	2022-02-20 21:24:37 +01:00
libvlc	Merge branch 'DRTVWR-544-maint' of https://bitbucket.org/lindenlab/viewer	2022-03-01 19:19:48 +01:00
CMakeLists.txt	Bring back gstreamer, remove the old and unmaintained Linux VLC version.	2022-02-20 21:24:37 +01:00