Vladimír Čunát 74488e2b58 Merge branch 'x-updates' into stdenv-updates ... Conflicts (simple): pkgs/development/libraries/glib/default.nix pkgs/development/libraries/mesa/default.nix		2013-09-02 15:44:57 +02:00
..
darwin	otool: fix licenses, adding the new APSL 2.0 as well	2013-08-13 07:34:37 +02:00
gnu
linux	bluez5: set meta.platforms attribute	2013-08-28 21:20:57 +02:00
windows	pthread-win32: don't propagate `mingw_headers'	2013-03-29 21:46:38 +01:00