Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates ... Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix		2013-06-08 15:41:39 +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 remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
windows	pthread-win32: don't propagate `mingw_headers'	2013-03-29 21:46:38 +01:00