Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-07-28 11:30:49 +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	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +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	Merge recent master into x-updates	2014-07-17 19:30:56 +02:00