Files
nixpkgs/pkgs/development/tools
Vladimír Čunát 9b02635faa Merge recent master into x-updates
Hydra: ?compare=1138350

Conflicts:
	nixos/modules/services/x11/desktop-managers/default.nix
	Two imports were added independently on the same line.
	I split it as well, as it was very long now.
2014-07-21 12:05:57 +02:00
..
2014-05-18 20:51:08 -07:00
2014-06-23 05:03:03 -04:00
2014-06-23 05:50:48 -04:00
2013-08-16 23:45:01 +02:00
2014-06-10 09:41:48 +04:00
2014-05-31 15:49:13 +02:00
2014-07-19 02:16:41 +02:00
2014-06-25 10:25:14 +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-07-15 01:53:07 +01:00
2014-07-06 01:34:11 -04:00