da4fca4ce4
(cherry picked from commit 9951478c40330b7cf7918ce93c7d242d99ffcd05) Conflicts: pkgs/development/libraries/ffmpeg/0.10.nix |
||
---|---|---|
doc | ||
lib | ||
maintainers/scripts | ||
nixos | ||
pkgs | ||
.gitignore | ||
.version | ||
COPYING | ||
default.nix | ||
README.md |