diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-23T20·16+0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-23T20·16+0200 |
| commit | 19eddecc0fc4e8c12063626eaf942642894a3580 (patch) | |
| tree | 92c66426a79420fe0daefd6f2911c0e9d9d68a06 /src/libstore/builtins.cc | |
| parent | b83801f8b3b48f4d69414401c8a51724946a8666 (diff) | |
| parent | db21cfa68820ed06f176aaf54e0ee5ce023951f7 (diff) | |
Merge branch 'attr-set-hh' of https://github.com/nbp/nix
Conflicts: src/libexpr/eval.cc
Diffstat (limited to 'src/libstore/builtins.cc')
0 files changed, 0 insertions, 0 deletions