Files
nixpkgs/pkgs/build-support
Vladimír Čunát e51f73652d Merge recent master into staging
Hydra: ?compare=1149952

Conflicts:
	nixos/doc/manual/configuration.xml (changed split file)
	nixos/modules/config/users-groups.nix (choosing filterNull instead of inline definition)
	pkgs/development/libraries/readline/readline6.3.nix (auto-solved)
2014-08-30 10:04:02 +02:00
..
2014-07-10 16:41:02 +02:00
2013-08-11 10:55:53 +00:00
2014-08-14 19:17:26 +02:00
2014-08-10 15:17:00 +02:00
2014-07-03 11:01:19 -04:00