Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
cinnamon
e17
e18	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
enlightenment
gnome-2
gnome-3	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
kde-4.12
xfce	xfce4-appfinder: update 4.9.4 -> 4.10.1	2014-07-31 16:30:04 +02:00