Skip to content
Snippets Groups Projects
Commit 00d543f0 authored by Joakim Olovsson's avatar Joakim Olovsson
Browse files

Merge branch 'devel' into 'test' 

Initial class vlc added

See merge request !1
parents d6a17e50 5c1a8aff
No related branches found
No related tags found
3 merge requests!15Revert "fix more name conflicts",!2Test,!1Initial class vlc added
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment