Skip to content
  • Martin Finkel's avatar
    Merge branch 'feature/Instance' · 735eff8b
    Martin Finkel authored
    # Conflicts:
    #	Bindings.Tests/InstanceTests.cs
    #	LibVlcSharp/Manual/Instance.cs
    #	LibVlcSharp/Manual/deprecated.cs
    #	LibVlcSharp/Manual/libvlc.cs
    #	LibVlcSharp/Manual/libvlc_media_discoverer.cs
    #	Sample/Sample.csproj
    735eff8b