Eelco Dolstra 7f410ef923 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/misc/vim-plugins/default.nix		2014-07-22 11:00:00 +02:00
..
applications	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
build-support	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
data
desktops	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
development	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
games
misc	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
os-specific	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
servers	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
shells	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
stdenv
test
tools	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
top-level	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00