nixpkgs/pkgs/desktops
Vladimír Čunát 8da52a642a Merge branch 'staging' into v/modular
Conflicts (easy):
	pkgs/development/interpreters/perl/5.10/setup-hook.sh
	pkgs/development/interpreters/perl/5.8/setup-hook.sh
	pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
..
cinnamon
e17 Merge branch 'staging' into v/modular 2014-08-31 12:23:18 +02:00
e18 Merge recent master into x-updates 2014-08-02 05:08:07 +02:00
enlightenment
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