Vladimír Čunát 620c147cce Merge branch 'master' into staging		2016-01-18 09:48:49 +01:00
..
0.10.nix	ffmpeg: update branches	2015-05-16 20:23:25 -04:00
1.2.nix
2.8.nix	ffmpeg(-2.8): security update to fix #12437	2016-01-17 09:56:32 +01:00
generic.nix	style fix in ffmpeg expression	2015-10-30 11:40:35 -07:00