Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates ... Conflicts (just different styles, same semantics): pkgs/development/libraries/libusb1/default.nix		2013-12-07 14:17:16 +01:00
..
cinnamon	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +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	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +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	KDE-4.11: update to 4.11.4	2013-12-04 16:57:36 +02:00
xfce	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00