Vladimír Čunát
0a58b512cb
Merge master into stdenv-updates
Conflicts (simple):
pkgs/development/compilers/gcc/4.8/default.nix
pkgs/development/compilers/llvm/default.nix
pkgs/development/libraries/gmp/5.1.1.nix
pkgs/development/libraries/gmp/5.1.3.nix
pkgs/development/libraries/gmp/5.1.x.nix
pkgs/top-level/all-packages.nix
2014-01-18 14:46:20 +01:00
..
2013-06-21 19:50:56 -04:00
2013-11-16 13:53:48 +01:00
2013-11-16 13:53:48 +01:00
2014-01-18 14:46:20 +01:00
2013-12-11 12:14:01 +01:00
2013-06-21 19:18:52 -04:00
2013-12-28 17:32:01 +01:00