Vladimír Čunát 7af694700c Merge branch 'master' into x-updates ... Silently merged badly the firefox 20/21 things. I got that, hopefully there aren't more (my nixos-rebuild dry-run finds no more errors).		2013-06-05 12:59:47 +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 branch 'master' into x-updates	2013-06-05 12:59:47 +02:00
windows	pthread-win32: don't propagate `mingw_headers'	2013-03-29 21:46:38 +01:00