Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/boost/generic.nix		2014-11-11 23:48:08 +01:00
..
activation	nixos-rebuild: reload dbus before starting other units. Closes #4546	2014-11-08 19:40:28 +01:00
boot	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
etc	setup-etc.pl: Keep track of copied files	2014-07-25 14:29:08 +02:00
upstart