Vladimír Čunát 35a927149f Merge branch 'master' into x-updates ... Conflicts (both messed with mesa): pkgs/top-level/all-packages.nix		2013-02-02 21:11:00 +01:00
..
e17	desktops/e17: Updated.	2012-03-25 13:50:39 +00:00
enlightenment
gnome-2	gtkglext: fix by using pangox_compat	2013-02-02 14:39:21 +01:00
kde-4.7	Merge remote-tracking branch 'origin/master' into systemd	2012-12-10 12:39:14 +01:00
kde-4.8	Use systemd instead of udev, and don't use consolekit	2012-11-06 13:02:11 +01:00
xfce-4.8	xfce4 terminal: fix url	2013-01-13 14:30:55 +01:00