Vladimír Čunát 625f40151b Merge branch 'master' into x-updates ... Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix		2013-08-02 18:30:53 +02:00
..
12.nix	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
15.nix	libpng: minor updates to 1.6.1 and 1.5.15	2013-03-29 00:01:10 +01:00
default.nix	Merge branch 'master' into x-updates	2013-08-02 18:30:53 +02:00