Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-07-28 11:30:49 +02:00
..
applications	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
build-support	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
data	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
desktops	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
development	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
games	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
misc	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
os-specific	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
servers	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
shells	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
stdenv	Doh	2014-07-28 09:37:23 +02:00
test
tools	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
top-level	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00