summary refs log tree commit diff
path: root/nix/libstore/pathlocks.hh
AgeCommit message (Collapse)Author
2014-12-19Merge branch 'nix' into 'master'.Ludovic Courtès