1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs synced 2024-10-19 03:47:13 -04:00
Nix Packages collection & NixOS
Find a file
Shea Levy acd4299e75 Merge branch 'master' into stdenv-updates
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.
2013-02-21 11:13:30 -05:00
doc
maintainers
pkgs Merge branch 'master' into stdenv-updates 2013-02-21 11:13:30 -05:00
.gitignore
COPYING
default.nix
VERSION