Vladimír Čunát b5fba47147 Merge branch master into x-updates ... Conflicts (not used, deleted): pkgs/desktops/xfce/common.nix		2013-11-23 10:22:26 +01:00
..
e17	add terminology: e17 terminal emulator	2013-04-04 22:18:08 +02:00
enlightenment	Enlightenment 0.16.8.15.	2009-01-22 22:46:39 +00:00
gnome-2	libunique: fix build, make the package unique	2013-11-17 22:26:49 +01:00
gnome-3	libcroco: minor update 0.6.6 -> .8	2013-11-18 20:30:21 +01:00
kde-4.10	KDE: we don't really support anything but Linux right now, so no reason to have all those evaluation	2013-08-25 01:07:46 +03:00
kde-4.11	KDE4.11: update to 4.11.2. Add missing xslt file.	2013-10-07 22:32:47 +03:00
xfce	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00