aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMike Pall <mike>2016-03-03 12:11:37 +0100
committerMike Pall <mike>2016-03-03 12:11:37 +0100
commitf4231949b5e14e1116452f9e9eea31e19a462c82 (patch)
tree8201252fca8a867ea4d1c33736f1a4dbfd77de6b /etc
parent6f3eed9fd8d4f666f21d1e15cdf377a71a3925cf (diff)
parentdb1b399af134e715b8ba9a0e4ad9cbafbe06ecb1 (diff)
downloadluajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.gz
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.tar.bz2
luajit-f4231949b5e14e1116452f9e9eea31e19a462c82.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 fd38b0a9..11e88c04 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-2015 Mike Pall. 77\fBLuaJIT\fR is Copyright \(co 2005-2016 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