Files
nixpkgs/pkgs/build-support
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
..
2011-02-08 13:09:17 +00:00
2012-06-20 23:28:53 -04:00
2008-07-06 15:46:10 +00:00
2005-12-05 14:11:09 +00:00
2012-12-18 16:57:11 +01:00