Vladimír Čunát 5979d428b4 Merge recent master into x-updates ... Hydra: ?compare=1134869 Conflicts (just meta): pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix		2014-07-09 22:13:29 +02:00
..
darwin	add htop fork for darwin (close #2690)	2014-06-11 20:36:10 +02:00
gnu
linux	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
windows	Merge 'mingw-w64' and 'darwin' into cross-win-osx.	2014-03-12 10:16:51 +01:00