Commit e077fc83 authored by Martin Finkel's avatar Martin Finkel

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

# Conflicts:
#	Bindings.Tests/MediaTests.cs
#	LibVLCSharp/Media.cs
parents c1ff47d5 61da6859
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