Vladimír Čunát 52404a868d Merge recent master into staging ... Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f82be3 Conflicts: nixos/tests/gnome3_10.nix (auto-solved) pkgs/applications/video/aegisub/default.nix pkgs/development/libraries/boost/1.55.nix		2014-11-05 15:00:44 +01:00
..
activation	Don't silently ignore errors from the activation script	2014-08-15 02:14:34 +02:00
boot	Merge recent master into staging	2014-11-05 15:00:44 +01: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