Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
activation	Add system.replaceRuntimeDependencies to quickly replace system dependencies	2014-06-06 21:17:31 +02:00
boot	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
etc	setup-etc.pl: Keep track of copied files	2014-07-25 14:29:08 +02:00
upstart	upstart: Oneshot rules should always have Restart=no	2014-04-16 01:04:52 +02:00