diff options
| author | Benoit Germain <bnt.germain@gmail.com> | 2011-11-07 20:10:51 +0100 |
|---|---|---|
| committer | Benoit Germain <bnt.germain@gmail.com> | 2011-11-07 20:10:51 +0100 |
| commit | e1969582b0a85c040641669ae2aaf67af67b3678 (patch) | |
| tree | f80691232179c235a25990d6f36000502c301b99 /src | |
| parent | fb4b7acae4bdacd6c0f669591956281011bc0068 (diff) | |
| parent | 0e9d9c3c0e61b2af5ba33893c94ee02a447d2ac7 (diff) | |
| download | lanes-e1969582b0a85c040641669ae2aaf67af67b3678.tar.gz lanes-e1969582b0a85c040641669ae2aaf67af67b3678.tar.bz2 lanes-e1969582b0a85c040641669ae2aaf67af67b3678.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'src')
| -rw-r--r-- | src/lanes.lua | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lanes.lua b/src/lanes.lua index 8837e4b..005ce28 100644 --- a/src/lanes.lua +++ b/src/lanes.lua | |||
| @@ -562,7 +562,9 @@ end | |||
| 562 | if _t ~= _timers then | 562 | if _t ~= _timers then |
| 563 | error( "mismatched configuration: " .. tostring( _t) .. " timer activity instead of " .. tostring( _timers)) | 563 | error( "mismatched configuration: " .. tostring( _t) .. " timer activity instead of " .. tostring( _timers)) |
| 564 | end | 564 | end |
| 565 | return lanes | ||
| 565 | end | 566 | end |
| 567 | return lanes | ||
| 566 | end -- lanes.configure | 568 | end -- lanes.configure |
| 567 | 569 | ||
| 568 | --the end | 570 | --the end |