Vladimír Čunát d4e9fd2a90 Merge recent master into staging ... Hydra: ?compare=1148749 Conflicts (easy): nixos/modules/virtualisation/containers.nix		2014-08-21 15:09:31 +02:00
..
cinnamon	desktops/cinnamon/*.nix: mark as broken per https://github.com/NixOS/nixpkgs/issues/2384	2014-04-28 23:20:37 +02:00
e17	e17.terminology: 0.4.0 -> 0.5.1	2014-06-15 09:26:01 +04:00
e18	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
enlightenment	Enlightenment 0.16.8.15.	2009-01-22 22:46:39 +00:00
gnome-2	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
gnome-3	Merge recent master into staging	2014-08-21 15:09:31 +02:00
kde-4.12	Fix broken license references.	2014-07-28 11:43:20 +02:00
xfce	xfce4-appfinder: update 4.9.4 -> 4.10.1	2014-07-31 16:30:04 +02:00