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
..
2012-07-12 14:28:19 -04:00
2013-08-17 10:00:16 +02:00
2013-10-17 18:35:24 +02:00
2013-10-20 21:10:02 +04:00
2013-07-14 05:23:06 +03:00
2012-06-24 16:37:32 +03:00
2012-05-11 12:16:09 +00:00
2013-12-21 02:28:28 +02:00
2013-08-26 14:25:51 +02:00
2013-05-17 23:48:22 +02:00