William A. Kennington III dd2de66d61 Merge branch 'master.upstream' into staging.upstream		2015-10-30 17:16:07 -07:00
..
0.10.nix
1.2.nix
2.2.nix
2.8.nix	ffmpeg: 2.7.2 -> 2.8.1 (close #10396)	2015-10-15 21:07:00 +02:00
generic.nix	style fix in ffmpeg expression	2015-10-30 11:40:35 -07:00