Peter Simons a9c53037fa Merge remote-tracking branch 'origin/master' into staging.		2014-11-02 16:15:53 +01:00
..
config	Merge remote-tracking branch 'origin/master' into staging.	2014-11-02 16:15:53 +01:00
hardware	ati_unfree: Update nixos-manual for AMD driver support	2014-09-07 12:42:32 +10:00
installer	Merge pull request #4213 from wkennington/master.zfsiso	2014-10-25 18:01:17 -07:00
misc	nixos: prosody was clashing with seeks unix ids	2014-10-20 17:22:01 +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	sudo: allow adding extra configuration options to the bottom of sudoers	2014-11-02 13:27:05 +01:00
services	Merge remote-tracking branch 'origin/master' into staging.	2014-11-02 16:15:53 +01:00
system	Merge recent master into staging	2014-10-23 17:40:41 +02:00
tasks	nixos: Add a filesystem module for JFS.	2014-10-22 08:22:57 +02:00
testing	Fix evaluation	2014-08-06 19:44:13 +02:00
virtualisation	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
module-list.nix	nixos: Add a filesystem module for JFS.	2014-10-22 08:22:57 +02:00
rename.nix	syslog-ng: Update from 3.5.6 to 3.6.1	2014-10-27 12:22:22 +01:00