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
..
3.3
3.4
4.2
4.2-apple64
4.3	Merge branch 'origin/master' into stdenv.	2013-08-17 10:00:16 +02:00
4.4	Merge glibc-2.18 branch into stdenv-updates	2013-12-28 18:51:23 +01:00
4.5	gcc: Fix building 4.5 and 4.6	2014-01-13 20:53:06 +01:00
4.6	gcc: Fix building 4.5 and 4.6	2014-01-13 20:53:06 +01:00
4.8	Merge master into stdenv-updates	2014-01-18 14:46:20 +01:00