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-12-04 18:33:52 +01:00
2012-01-18 20:16:00 +00:00
2014-01-07 14:25:42 +01:00
2013-05-11 00:36:59 +02:00
2014-01-07 14:24:59 +01:00
2014-01-12 12:29:24 +01:00
2014-01-03 11:56:41 +01:00
2011-08-10 09:54:22 +00:00
2013-12-14 00:41:47 +02:00