nixpkgs/pkgs/desktops
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
..
cinnamon cinnamon-session: minor tweaks and make schemas available 2013-12-10 22:46:34 +01:00
e17 add terminology: e17 terminal emulator 2013-04-04 22:18:08 +02:00
enlightenment
gnome-2 Merge master into x-updates 2013-12-18 23:21:29 +01:00
gnome-3 Merge master into x-updates 2013-12-18 23:21:29 +01:00
kde-4.10 KDE-4.10: Kopete: fix build against giflib5 2013-12-08 12:04:02 +02: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