Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size ... Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.		2016-04-01 10:06:01 +02:00
..
0.10.nix	ffmpeg: update branches	2015-05-16 20:23:25 -04:00
1.2.nix	ffmpeg: refactor to generic	2015-02-28 12:12:25 -05:00
2.8.nix	ffmpeg: 2.8.5 -> 2.8.6 (CVE-2016-2329)	2016-02-27 16:34:02 +01:00
generic.nix	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00