Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
cinnamon	desktops/cinnamon/*.nix: mark as broken per https://github.com/NixOS/nixpkgs/issues/2384	2014-04-28 23:20:37 +02:00
e17	e17.terminology: 0.4.0 -> 0.5.1	2014-06-15 09:26:01 +04:00
e18	e18: enlightenment desktop manager version 18	2014-07-17 23:00:38 +02:00
enlightenment
gnome-2	vte: store patch in repo, source offline	2014-06-30 16:10:50 +02:00
gnome-3	Merge remote-tracking branch 'origin/master' into staging	2014-07-14 17:04:55 +02:00
kde-4.12	ark: wrap for zipinfo	2014-05-25 15:25:34 -05:00
xfce	xfce4-xkb-plugin: maintenance update	2014-07-07 19:03:48 +02:00