Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ... Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix		2014-09-02 12:31:03 +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	Fix many package descriptions	2014-08-24 22:31:37 +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 branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
kde-4.12	kde4: security patch for CVE-2014-5033	2014-08-21 15:13:18 +02:00
xfce	xfce4-appfinder: update 4.9.4 -> 4.10.1	2014-07-31 16:30:04 +02:00