Vladimír Čunát 6295a3ca36 Merge recent master into x-updates ... Hydra: ?compare=1142825 Conflicts (easy): pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-08-02 05:08:07 +02:00
..
darwin	add htop fork for darwin (close #2690)	2014-06-11 20:36:10 +02:00
gnu	gnu: Fix (evaluation of the) call to forceSystem.	2014-07-28 20:46:32 +02:00
linux	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
windows	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00