nixpkgs/pkgs/development/libraries/ffmpeg-full
Tuomas Tynkkynen 6b6a575748 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/tools/networking/telnet/default.nix
	pkgs/top-level/aliases.nix
2018-05-16 03:09:33 +03:00
..
default.nix Merge remote-tracking branch 'upstream/master' into staging 2018-05-16 03:09:33 +03:00
nv-codec-headers.nix ffmpeg-full: 3.4.2 -> 4.0 2018-05-14 21:05:42 -07:00