summary refs log tree commit diff
path: root/nix/nix-daemon/nix-daemon.cc
AgeCommit message (Expand)Author
2015-05-19Merge branch 'nix'.Ludovic Courtès
2014-12-19Merge branch 'nix' into 'master'.Ludovic Courtès