Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
config	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
hardware	ati_unfree: Update nixos-manual for AMD driver support	2014-09-07 12:42:32 +10:00
installer	Merge recent master into staging	2014-09-13 21:48:29 +02:00
misc	mailpile: add module	2014-09-26 10:49:09 +02:00
profiles	Merge remote-tracking branch 'origin/staging'	2014-09-08 11:42:09 +02:00
programs	alsa: Add multilib plugin support via "libs" entry in asound config.	2014-10-04 14:48:58 +02:00
security	Remove some setuid wrappers for non-standard programs	2014-09-05 14:46:36 +02:00
services	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
system	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00
tasks	network-interfaces: Bonding fixes	2014-10-04 18:37:00 -07:00
testing
virtualisation	Merge remote-tracking branch 'origin/master' into staging	2014-09-18 22:28:35 +02:00
module-list.nix	Merge pull request #4280 from wkennington/master.consul	2014-09-27 07:00:39 +02:00
rename.nix	nixos: mark services.samba.defaultShare as obsolete	2014-09-24 23:07:04 +02:00