nixpkgs/pkgs/desktops
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
..
cinnamon desktops/cinnamon/*.nix: mark as broken per https://github.com/NixOS/nixpkgs/issues/2384 2014-04-28 23:20:37 +02:00
e17 Fix many package descriptions 2014-08-24 22:31:37 +02: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 gtkglext: cleanup 2014-08-23 11:46:54 +02:00
gnome-3 Merge recent master into staging 2014-08-30 10:04:02 +02:00
kde-4.12 kde4: security patch for CVE-2014-5033 2014-08-21 15:13:18 +02:00
xfce xfce4-appfinder: update 4.9.4 -> 4.10.1 2014-07-31 16:30:04 +02:00