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-11-04 21:11:00 +01:00
2012-12-28 19:20:09 +01:00
2014-01-16 14:36:42 +01:00
2013-06-05 21:24:19 +02:00
2013-07-27 19:56:22 +02:00
2010-07-19 10:18:06 +00:00
2012-01-18 20:16:00 +00:00
2011-08-29 18:58:59 +00:00
2013-06-05 21:24:19 +02:00
2013-12-29 10:01:22 +01:00
2010-07-29 08:21:21 +00:00
2014-01-16 14:36:42 +01:00
2012-07-14 15:13:08 -04:00