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