Ludovic Courtès 36457566f9 Merge branch 'nix' into 'master'.		2014-12-19 22:47:37 +01:00
..
guix-daemon.cc	daemon: Default to '--cores=0'.	2014-11-30 18:54:07 +01:00
nix-daemon.cc	Merge branch 'nix' into 'master'.	2014-12-19 22:47:37 +01:00
shared.hh