Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
cinnamon
e17
e18
e19
enlightenment
gnome-2
gnome-3	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
kde-4.12
kde-4.14
xfce	XFCE battery plugin: new package	2014-10-05 17:18:37 +01:00