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.6	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
2.7	Merge branch 'origin/master' into stdenv-updates.	2013-10-18 18:57:24 +02:00
3.2
3.3
docs
python-linkme-wrapper.nix
python-linkme-wrapper.sh
wrapper.nix	Partial revert of b09f8110db	2013-11-19 09:04:32 -05:00