Vladimír Čunát 3ec2cea214 Merge master into x-updates ... Conflicts (auto-solved): pkgs/os-specific/linux/alsa-plugins/default.nix		2014-06-20 00:24:38 +02:00
..
darwin	add htop fork for darwin (close #2690)	2014-06-11 20:36:10 +02:00
gnu	More renames	2012-12-28 19:42:10 +01:00
linux	Merge master into x-updates	2014-06-20 00:24:38 +02:00
windows	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00