da4fca4ce4
(cherry picked from commit 9951478c40330b7cf7918ce93c7d242d99ffcd05) Conflicts: pkgs/development/libraries/ffmpeg/0.10.nix |
||
---|---|---|
.. | ||
0.6.90.nix | ||
0.6.nix | ||
0.10.nix | ||
1.x.nix | ||
2.x.nix |
da4fca4ce4
(cherry picked from commit 9951478c40330b7cf7918ce93c7d242d99ffcd05) Conflicts: pkgs/development/libraries/ffmpeg/0.10.nix |
||
---|---|---|
.. | ||
0.6.90.nix | ||
0.6.nix | ||
0.10.nix | ||
1.x.nix | ||
2.x.nix |