Skip to content
Snippets Groups Projects
Commit 50b31f71 authored by Ehret's avatar Ehret
Browse files

Merge branch 'feature/add_vlc_binaries' into develop

# Conflicts:
#	Plugins/VlcMedia/ThirdParty/vlc/Linux/x86_64-unknown-linux-gnu/lib/libvlc.so.5
#	Plugins/VlcMedia/ThirdParty/vlc/Linux/x86_64-unknown-linux-gnu/lib/libvlc.so.5.6.0
#	Plugins/VlcMedia/ThirdParty/vlc/Linux/x86_64-unknown-linux-gnu/lib/libvlccore.so.9
#	Plugins/VlcMedia/ThirdParty/vlc/Linux/x86_64-unknown-linux-gnu/lib/libvlccore.so.9.0.0
parents c8e9b95e ba4cf2f5
No related branches found
No related tags found
No related merge requests found
Showing
with 7348 additions and 3 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment