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
..
default.nix	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
fox-1.6.nix	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00