Peter Simons 6694ef42a9 Merge branch 'master' into staging. ... Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/tools/security/gnupg/21.nix pkgs/top-level/all-packages.nix		2015-03-10 12:09:43 +01:00
..
3.3	rename all occurrences of stdenv.cc.gcc to stdenv.cc.cc	2015-01-14 20:27:55 -08:00
3.4	mpc: also rename the attribute to libmpc	2015-01-17 09:55:32 +01:00
3.5	llvm-3.5: enable RTTI to support mesa	2015-03-09 15:55:23 +01:00
3.6	llvm-3.6 packages: Build everything (except clang and llvm) with clang	2015-03-07 13:08:34 +00:00