Vladimír Čunát 82797f98f2 Merge branch 'staging' into modular-stdenv ... Conflicts: pkgs/development/interpreters/perl/5.10/setup-hook.sh pkgs/development/interpreters/perl/5.8/setup-hook.sh pkgs/stdenv/linux/default.nix		2014-09-08 18:24:58 +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	Merge branch 'staging' into modular-stdenv	2014-09-08 18:24:58 +02:00
e18	Merge recent master into x-updates	2014-08-02 05:08:07 +02:00
enlightenment	Enlightenment 0.16.8.15.	2009-01-22 22:46:39 +00:00
gnome-2	Make sure gnome-python has gnomevfs binding	2014-08-30 15:56:22 +02:00
gnome-3	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
kde-4.12	kde4: security patch for CVE-2014-5033	2014-08-21 15:13:18 +02:00
xfce	xfce4-mixer: use wrapper to set GST_PLUGIN_SYSTEM_PATH	2014-08-19 09:57:30 +08:00