aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMike Pall <mike>2015-01-04 22:58:41 +0100
committerMike Pall <mike>2015-01-04 22:58:41 +0100
commit968725c4d57851f46d5aa51ad8db8880e323300b (patch)
tree4ed81d766b4d1449ccd6c0e04ffd22951bd51b19 /doc
parentf307d0adafc7e35d2dc1c461d50f6572c5e6bca8 (diff)
parent9caaf6595fce4204fb55d73a6e3bb34b43cd85a6 (diff)
downloadluajit-968725c4d57851f46d5aa51ad8db8880e323300b.tar.gz
luajit-968725c4d57851f46d5aa51ad8db8880e323300b.tar.bz2
luajit-968725c4d57851f46d5aa51ad8db8880e323300b.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'doc')
-rw-r--r--doc/ext_jit.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/ext_jit.html b/doc/ext_jit.html
index fb4d434b..ddc8337d 100644
--- a/doc/ext_jit.html
+++ b/doc/ext_jit.html
@@ -153,7 +153,7 @@ Contains the target OS name:
153<h3 id="jit_arch"><tt>jit.arch</tt></h3> 153<h3 id="jit_arch"><tt>jit.arch</tt></h3>
154<p> 154<p>
155Contains the target architecture name: 155Contains the target architecture name:
156"x86", "x64" or "ppcspe". 156"x86", "x64", "arm", "ppc", "ppcspe", or "mips".
157</p> 157</p>
158 158
159<h2 id="jit_opt"><tt>jit.opt.*</tt> &mdash; JIT compiler optimization control</h2> 159<h2 id="jit_opt"><tt>jit.opt.*</tt> &mdash; JIT compiler optimization control</h2>