Vladimír Čunát bde20f3e88 Merge branch 'master' into x-updates ... Conflicts (just taken x-updates): pkgs/servers/x11/xorg/overrides.nix		2013-04-24 06:29:09 +00: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
linux	Merge branch 'master' into x-updates	2013-04-24 06:29:09 +00:00
windows	pthread-win32: don't propagate `mingw_headers'	2013-03-29 21:46:38 +01:00