aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMike Pall <mike>2014-01-16 23:18:34 +0100
committerMike Pall <mike>2014-01-16 23:18:34 +0100
commita9d454360161d80310753dafa0d945eea4d98fde (patch)
tree892e5802f261a8c4ac3de4d802b5881aed36eac1 /etc
parentce9e8ed675d1fb7fe8e148a328fe0b892791a5f4 (diff)
parentef59e5482055ed4477144518fc79a993288e855b (diff)
downloadluajit-a9d454360161d80310753dafa0d945eea4d98fde.tar.gz
luajit-a9d454360161d80310753dafa0d945eea4d98fde.tar.bz2
luajit-a9d454360161d80310753dafa0d945eea4d98fde.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'etc')
-rw-r--r--etc/luajit.12
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/luajit.1 b/etc/luajit.1
index 6489bd3b..723a708c 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"
74Runs some nested loops and shows the resulting traces. 74Runs 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-2013 Mike Pall. 77\fBLuaJIT\fR is Copyright \(co 2005-2014 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