Skip to content
  • Sebastian Dröge's avatar
    Merge branch 'master' into 0.11 · a9b134d1
    Sebastian Dröge authored
    Conflicts:
    	docs/plugins/gst-plugins-base-plugins.hierarchy
    	docs/plugins/gst-plugins-base-plugins.interfaces
    	docs/plugins/gst-plugins-base-plugins.prerequisites
    a9b134d1