Vladimír Čunát f9f6f41bff Merge branch 'master' into closure-size ... TODO: there was more significant refactoring of qtbase and plasma 5.5 on master, and I'm deferring pointing to correct outputs to later.		2015-12-31 09:53:02 +01:00
..
config	Merge branch 'master' into closure-size	2015-12-31 09:53:02 +01:00
hardware	nixos/bumblebee: update for new packages	2015-12-05 00:54:09 +03:00
installer	Merge branch 'master' into closure-size	2015-12-31 09:53:02 +01:00
misc	Merge pull request #11956 from zimbatm/nm-openvpn-uid-gid	2015-12-27 11:02:55 +01:00
profiles	Merge remote-tracking branch 'origin/master' into closure-size	2015-11-25 21:37:30 +01:00
programs	zsh module: add /share/zsh to pathsToLink	2015-11-26 04:33:07 +03:00
security	Merge branch 'master' into closure-size	2015-12-31 09:53:02 +01:00
services	Merge branch 'master' into closure-size	2015-12-31 09:53:02 +01:00
system	Merge branch 'master' into closure-size	2015-12-31 09:53:02 +01:00
tasks	Merge branch 'master' into closure-size	2015-12-31 09:53:02 +01:00
testing	nixos/tests: Revert setting min_free_kbytes	2015-12-14 17:40:28 +01:00
virtualisation	Merge branch 'master' into closure-size	2015-12-31 09:53:02 +01:00
module-list.nix	Merge branch 'feature/simp_le-service' of https://github.com/mayflower/nixpkgs into mayflower-feature/simp_le-service	2015-12-13 17:01:42 +03:00
rename.nix	hostapd: rename extraCfg -> extraConfig, added asserts	2015-12-26 11:37:00 +01:00