Ansariel 0dd4b94ef0 Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm ... # Conflicts: # indra/llcommon/llapp.cpp # indra/llcommon/llapp.h # indra/llcommon/llpointer.h # indra/llimage/llimageworker.cpp # indra/llui/llcontainerview.cpp # indra/llui/llcontainerview.h # indra/llui/llkeywords.cpp # indra/llui/lltabcontainer.cpp # indra/llui/lltextbase.cpp # indra/llwindow/llwindowwin32.cpp # indra/newview/llappviewer.cpp # indra/newview/llfavoritesbar.cpp # indra/newview/llfavoritesbar.h # indra/newview/llfloaterpreference.cpp # indra/newview/llhudnametag.h # indra/newview/llinventorypanel.cpp # indra/newview/llinventorypanel.h # indra/newview/llmeshrepository.cpp # indra/newview/lloutfitgallery.cpp # indra/newview/lloutfitslist.cpp # indra/newview/llpaneleditwearable.cpp # indra/newview/llpanelprofilepicks.cpp # indra/newview/llpanelvoicedevicesettings.h # indra/newview/llpreviewscript.cpp # indra/newview/llpreviewscript.h # indra/newview/llscrollingpanelparam.cpp # indra/newview/llselectmgr.cpp # indra/newview/llviewerassetupload.cpp # indra/newview/llviewermessage.cpp # indra/newview/llviewerregion.cpp # indra/newview/skins/default/xui/en/panel_performance_complexity.xml # indra/newview/skins/default/xui/en/panel_performance_huds.xml		2024-04-10 12:32:32 +02:00
..
base	Switch to target_include_directories	2022-04-17 18:04:57 +02:00
cef	Merge branch 'master' of https://github.com/FirestormViewer/phoenix-firestorm	2024-04-10 12:32:32 +02: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