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
..
default.nix	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
dont_include_curl_types_h.patch	made sword build against current curl (v7.22.0) by removing deprecated includes	2011-11-05 22:12:18 +00:00
gcc47.patch	sword: fix build with gcc47 via a patch from Gentoo	2013-03-17 12:37:39 +01:00