Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates ... Conflicts: pkgs/applications/graphics/rawtherapee/default.nix pkgs/applications/misc/blender/default.nix pkgs/applications/networking/browsers/chromium/sources.nix pkgs/os-specific/linux/kernel/linux-3.9.nix pkgs/top-level/all-packages.nix		2013-04-04 21:43:40 +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-04-04 21:43:40 +02:00
windows	pthread-win32: don't propagate `mingw_headers'	2013-03-29 21:46:38 +01:00