Vladimír Čunát e740b565cf Merge master into stdenv-updates ... Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix		2013-12-29 10:01:22 +01:00
..
2.x.nix	Merge branch 'origin/master' into stdenv.	2013-08-17 10:00:16 +02:00
3.x.nix	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00