summaryrefslogtreecommitdiff
path: root/nix/libstore/derivations.cc
Commit message (Expand)AuthorAge
* Merge branch 'nix'.Ludovic Courtès2015-07-03
* Merge commit a1dd396cc02922372314c35c8035a38bfeea08df of branch 'nix'.Ludovic Courtès2015-01-04
* Merge branch 'nix' into 'master'.Ludovic Courtès2014-12-19