aboutsummaryrefslogtreecommitdiff
path: root/nix/nix-daemon/nix-daemon.cc
Commit message (Expand)AuthorAge
* Merge branch 'nix'.Ludovic Courtès2015-05-19
* Merge branch 'nix' into 'master'.Ludovic Courtès2014-12-19