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	Move "darwin-native-x11-and-opengl" package into the "os-specific" hierarchy.	2013-01-30 14:53:04 +01:00
gnu	More renames	2012-12-28 19:42:10 +01:00
linux	Merge 'master' and 'stdenv-fixes' into x-updates	2013-06-16 10:13:51 +02:00
windows	pthread-win32: don't propagate `mingw_headers'	2013-03-29 21:46:38 +01:00