Vladimír Čunát 09af15654f Merge master into closure-size ... The kde-5 stuff still didn't merge well. I hand-fixed what I saw, but there may be more problems.		2016-03-08 09:58:19 +01: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	rename moveToOutput and propagatedBuildInputs	2015-12-02 10:05:36 +01:00