Vladimír Čunát b5fba47147 Merge branch master into x-updates ... Conflicts (not used, deleted): pkgs/desktops/xfce/common.nix		2013-11-23 10:22:26 +01:00
..
darwin	darwin x11/opengl: only copy subset of files (close #1165)	2013-11-07 10:39:28 +01:00
gnu	More renames	2012-12-28 19:42:10 +01:00
linux	Merge branch master into x-updates	2013-11-23 10:22:26 +01:00
windows	pthread-win32: don't propagate `mingw_headers'	2013-03-29 21:46:38 +01:00