Vladimír Čunát 85aafda509 merge #7299: gstreamer: Darwin fixes ...

Solved trivial merge conflicts.

2015-04-29 17:53:09 +02:00

..

default.nix

merge #7299: gstreamer: Darwin fixes

2015-04-29 17:53:09 +02:00