diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21T14·30+0100 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-01-21T14·30+0100 |
| commit | 81628a6ccc6ce496735b22492bee15c9ad46f072 (patch) | |
| tree | d1ec18b84514d2f44700082f8d800efb929a7678 /tests/nix-push.sh | |
| parent | b1db599dd05e86f65e73dc40584913e6e78c2bac (diff) | |
| parent | 5ef8508a92997dbd7f8aa501b64fd283fb1c7bb8 (diff) | |
Merge branch 'master' into make
Conflicts: src/libexpr/eval.cc
Diffstat (limited to 'tests/nix-push.sh')
0 files changed, 0 insertions, 0 deletions