Files
nixpkgs/pkgs/development/tools
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-08-24 22:31:37 +02:00
2014-05-18 20:51:08 -07:00
2014-07-22 11:01:32 +02:00
2014-07-22 11:01:32 +02:00
2014-08-24 22:31:37 +02:00
2014-05-31 15:49:13 +02:00
2014-08-30 10:04:02 +02:00
2014-08-24 22:31:37 +02:00
2014-07-22 11:01:32 +02:00
2014-08-24 22:31:37 +02:00
2014-08-24 22:31:37 +02:00
2014-07-14 15:35:27 +02:00
2014-06-30 12:48:38 +02:00
2014-05-31 15:49:13 +02:00
2014-05-28 01:33:28 +04:00
2014-08-24 22:31:37 +02:00
2014-07-15 01:53:07 +01:00