Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates ... Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix		2013-04-24 06:29:09 +00:00
..
e17	add terminology: e17 terminal emulator	2013-04-04 22:18:08 +02:00
enlightenment
gnome-2	python_rsvg: couldn't find gtk, fixed now	2013-04-18 10:04:56 +02:00
gnome-3	gnome3.at_spi2_core: supply path to system-wide dbus-daemon	2013-04-18 09:54:33 +02:00
kde-4.7	A more complete fix of cyrus-sasl update (broken KDEs).	2013-03-13 21:06:37 +01:00
kde-4.8	kde48.okteta: disable parallel build	2013-02-28 09:54:22 +01:00
kde-4.10	Add KDE 4.10.2. Not ready for production yet, but does compile.	2013-04-21 05:46:18 +03:00
xfce	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00