summary refs log tree commit diff
path: root/nix/libstore/misc.cc
AgeCommit message (Expand)Author
2015-07-03Merge branch 'nix'.Ludovic Courtès
2015-01-04Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'.Ludovic Courtès
2014-12-19Merge branch 'nix' into 'master'.Ludovic Courtès