summaryrefslogtreecommitdiff
path: root/nix/libstore/globals.cc
Commit message (Expand)AuthorAge
* Merge branch 'nix' into 'master'.Ludovic Courtès2014-12-19