acd4299e75
Conflicts: pkgs/applications/networking/browsers/chromium/default.nix pkgs/top-level/all-packages.nix Merge conflicts seemed trivial, but a look from viric and aszlig would be nice. |
||
|---|---|---|
| .. | ||
| make-initrd.nix | ||
| make-initrd.sh | ||
| modules-closure.nix | ||
| modules-closure.sh | ||
| paths-from-graph.pl | ||