diff options
| author | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
| commit | 0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535 (patch) | |
| tree | 79adfce53c856e0b066683352fd95cb40c97b3c5 /etc | |
| parent | c71cdf4c36145dd052734779d297fdbd7455468f (diff) | |
| parent | 86913b9bbf75c78a5dcfa2bf6071db8db7df7c51 (diff) | |
| download | luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.gz luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.bz2 luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/luajit.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/luajit.1 b/etc/luajit.1 index 723a708c..fd38b0a9 100644 --- a/etc/luajit.1 +++ b/etc/luajit.1 | |||
| @@ -74,7 +74,7 @@ luajit \-jv \-e "for i=1,10 do for j=1,10 do for k=1,100 do end end end" | |||
| 74 | Runs some nested loops and shows the resulting traces. | 74 | Runs some nested loops and shows the resulting traces. |
| 75 | .SH COPYRIGHT | 75 | .SH COPYRIGHT |
| 76 | .PP | 76 | .PP |
| 77 | \fBLuaJIT\fR is Copyright \(co 2005-2014 Mike Pall. | 77 | \fBLuaJIT\fR is Copyright \(co 2005-2015 Mike Pall. |
| 78 | .br | 78 | .br |
| 79 | \fBLuaJIT\fR is open source software, released under the MIT license. | 79 | \fBLuaJIT\fR is open source software, released under the MIT license. |
| 80 | .SH SEE ALSO | 80 | .SH SEE ALSO |