Peter Simons f67d5a9a39 Merge branch 'master' into stdenv-updates. ... Conflicts have been resolved in: pkgs/tools/misc/file/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/python-packages.nix		2012-11-21 16:20:36 +01:00
..
2.95
3.3
3.4
4.0
4.1
4.2
4.2-apple32
4.2-apple64	Apple GCC: Fix `no-sys-dirs.patch' so that it applies.	2012-04-13 12:41:36 +00:00
4.3	ghdl: building the standard libs with -O2	2012-11-13 15:16:32 +01:00
4.4
4.5	gcc 4.5: Update to 4.5.4.	2012-08-20 10:15:17 +02:00
4.6	gcc: Get rid of lib64	2012-10-16 14:34:27 -04:00
4.7	gcc 4.7: remove attempt to modify non-existent file	2012-11-17 20:54:29 +01:00