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	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
e19	Add package: Enlightenment E19!	2014-09-15 23:34:28 +02:00
enlightenment	Enlightenment 0.16.8.15.	2009-01-22 22:46:39 +00:00
gnome-2	Merge recent master into staging	2014-09-13 21:48:29 +02:00
gnome-3	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
kde-4.12	kde412: Add boost libs to kdepim	2014-09-22 11:34:53 -07:00
kde-4.14	kde-workspace: Use automatic version (close #4383)	2014-10-05 17:05:40 +02:00
xfce	XFCE battery plugin: new package	2014-10-05 17:18:37 +01:00