Franz Pletz c0fa26ef3b Merge remote-tracking branch 'origin/master' into hardened-stdenv		2016-08-24 11:01:53 +02:00
..
config	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
hardware	Merge branch 'master' into staging	2016-08-21 12:03:41 +01:00
i18n/input-method	fcitx-unikey: mention in dockbook	2016-08-12 14:36:36 +07:00
installer	Merge branch 'install-bootloader-flag'	2016-08-17 21:16:29 -04:00
misc	mattermost service: init	2016-08-15 04:15:11 +02:00
profiles	documentation: fix start display-manager command	2016-07-04 10:25:31 +02:00
programs	nixos/shadow: setuid wrappers for new{uid,gid}map	2016-08-19 14:59:33 +02:00
security	ldap: Add option for login PAM integration	2016-08-23 21:12:51 +02:00
services	Revert "Remove lsh, broken & unmaintained"	2016-08-23 15:32:41 +00:00
system	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
tasks	treewide: update cifs-utils attr references (cifs_utils -> cifs-utils)	2016-08-22 17:28:26 +02:00
testing	KDE test: Bump kdm start timeout	2016-05-27 11:22:27 +02:00
virtualisation	treewide: Use makeBinPath	2016-08-23 01:18:10 +03:00
module-list.nix	Revert "lsh: remove last references"	2016-08-23 15:31:33 +00:00
rename.nix	fontconfig-ultimate: 2015-12-06 -> 2016-04-23	2016-08-20 03:21:05 +03:00