Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv ... Conflicts: pkgs/tools/security/gnupg/default.nix		2014-10-09 10:57:57 +02:00
..
audio	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
display-managers
editors	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00
gis
graphics
inferno
misc
networking
office
science	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
search
taxes
version-management	Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv	2014-10-09 10:57:57 +02:00
video
virtualization
window-managers