nixpkgs/pkgs/servers/serfdom
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
..
default.nix Merge remote-tracking branch 'origin/master' into staging 2014-07-28 11:30:49 +02:00
deps.nix Update Serf to 0.6.3 2014-07-25 16:51:54 +01:00