Eelco Dolstra a85dcf4a00 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/libav/default.nix pkgs/shells/bash/bash-4.2-patches.nix pkgs/stdenv/generic/default.nix		2014-10-07 00:09:37 +02:00
..
activation	Don't silently ignore errors from the activation script	2014-08-15 02:14:34 +02:00
boot	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +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