Vladimír Čunát c72ed04892 Merge 'master' and 'stdenv-fixes' into x-updates ... Final stabilization phase before merging into master. Conflicts (glibc-2.13): pkgs/top-level/all-packages.nix		2013-06-16 10:13:51 +02:00
..
darwin/native-x11-and-opengl
gnu
linux	Merge 'master' and 'stdenv-fixes' into x-updates	2013-06-16 10:13:51 +02:00
windows