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
..
applications	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
build-support
data
desktops	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
development	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
games
misc
os-specific	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
servers	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00
shells
stdenv
test
tools
top-level	Merge recent master into x-updates	2014-07-09 22:13:29 +02:00