diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-04T16·22+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2012-01-04T16·22+0000 |
commit | adaf64a99b0a882249e35768c3f4fe3de104cbb2 (patch) | |
tree | 89b3becb5f9197f3d453355262549ea8bf08b9d2 /tests/timeout.sh | |
parent | 63227d434cefaa9faeb14afe28ebeb9b2d449ee2 (diff) | |
parent | 9936da6b546d1ce643eca21ac76c6e7d568de1c2 (diff) |
* Merge the multiple-outputs-sandbox branch (svn merge --reintegrate
^/nix/branches/multiple-outputs-sandbox). Multiple output support still isn't complete, but it wasn't complete in the trunk either, so it doesn't hurt.
Diffstat (limited to 'tests/timeout.sh')
0 files changed, 0 insertions, 0 deletions