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. |
||
|---|---|---|
| .. | ||
| audio | ||
| display-managers/slim | ||
| editors | ||
| graphics | ||
| misc | ||
| networking | ||
| office | ||
| science | ||
| taxes | ||
| version-management | ||
| video | ||
| virtualization | ||
| window-managers | ||