Commit 0212eb6b authored by Martin Finkel's avatar Martin Finkel

Merge branch 'rendererDiscoverer' of github.com:mfkl/LibVLCSharp into rendererDiscoverer

# Conflicts:
#	LibVLCSharp.Tests/RendererDiscovererTests.cs
#	LibVLCSharp/RendererDiscoverer.cs
parents 8d736293 e21df256
Markdown is supported
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