Vladimír Čunát 8ba92b8895 Merge master into stdenv-updates ... Conflicts (simple): pkgs/development/tools/misc/binutils/default.nix pkgs/tools/package-management/disnix/default.nix pkgs/top-level/all-packages.nix		2013-07-08 10:48:05 +02:00
..
5_4.nix	newsbeuter: add expression	2013-07-04 19:17:07 +02:00
default.nix	Add ncursesw compatibility link also for includes	2013-05-27 18:16:00 +02:00
patch-ac	Fix ncurses build on Illumos.	2013-02-28 20:04:05 +01:00