Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ...

Conflicts:
	pkgs/desktops/e18/enlightenment.nix

2014-08-04 16:51:47 +02:00

..

link-against-ncurses.patch

…

no-arch_only-6.3.patch

…

no-arch_only.patch

…

readline4.nix

…

readline5.nix

…

readline6.3.nix

…

readline6.nix

…

readline-6.2-patches.nix

…

shobj-darwin.patch

…