Vladimír Čunát 031baae714 Merge branch 'staging' into v/modular ...

Conflicts (as in p/modular-stdenv):
	pkgs/stdenv/linux/default.nix

2014-08-30 08:33:10 +02:00

..

3.3

gcc33: no longer broken, apparently

2014-08-10 18:25:34 +02:00

3.4

gcc34: fix build on i686

2013-03-16 20:40:04 +01:00

4.2-apple64

Hack to fix llvm/clang build on Darwin

2014-08-09 23:31:00 +02:00

4.3

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

4.4

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

4.5

Turn some license strings into lib.licenses values

2014-07-28 11:31:14 +02:00

4.6

mutiout: make it builtin

2014-08-30 08:27:43 +02:00

4.8

Merge branch 'staging' into v/modular

2014-08-30 08:33:10 +02:00

4.9

Merge branch 'staging' into v/modular

2014-08-30 08:33:10 +02:00