Lluís Batlle i Rossell b58780c43d Merge remote-tracking branch 'eelco/master' into stdenv-updates ...

Conflicts:
	pkgs/development/compilers/gcc/4.7/default.nix

Trivial solution.

2012-12-28 23:28:16 +01:00

..

2.0.nix

eigen: adding back eigen 2.0, for kde.

2012-12-14 22:23:36 +01:00

default.nix

Merge remote-tracking branch 'eelco/master' into stdenv-updates

2012-12-28 23:28:16 +01:00