aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorMike Pall <mike>2017-01-17 12:41:05 +0100
committerMike Pall <mike>2017-01-17 12:41:05 +0100
commit71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd (patch)
tree898e706d4b2455c2c3799cc179f3bc7adf096858 /etc
parentc94b921f924c1b37fea52e34f4e01ba8b37d77d0 (diff)
parentb93a1dd0c831cab22f98163d0dde792a493c0eef (diff)
downloadluajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.gz
luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.bz2
luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.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 11e88c04..0d263db7 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-2016 Mike Pall. 77\fBLuaJIT\fR is Copyright \(co 2005-2017 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