diff options
| author | Mike Pall <mike> | 2015-03-11 17:47:32 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-03-11 17:47:32 +0100 |
| commit | 4e52d1f17ed97dea5248c18a0fa89b3c49bab389 (patch) | |
| tree | 0f5ec0bea6d4174073ba1feb34fe3a6614997487 /doc | |
| parent | 361827c8f986a73cdccfc98ad16fe9f33ed6fb25 (diff) | |
| parent | a9fd68674483b2f886b925c2199e5f81c36c656a (diff) | |
| download | luajit-4e52d1f17ed97dea5248c18a0fa89b3c49bab389.tar.gz luajit-4e52d1f17ed97dea5248c18a0fa89b3c49bab389.tar.bz2 luajit-4e52d1f17ed97dea5248c18a0fa89b3c49bab389.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/status.html | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/doc/status.html b/doc/status.html index cf137ee0..91ed9cba 100644 --- a/doc/status.html +++ b/doc/status.html | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> | 1 | <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> |
| 2 | <html> | 2 | <html> |
| 3 | <head> | 3 | <head> |
| 4 | <title>Status & Roadmap</title> | 4 | <title>Status</title> |
| 5 | <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> | 5 | <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> |
| 6 | <meta name="Author" content="Mike Pall"> | 6 | <meta name="Author" content="Mike Pall"> |
| 7 | <meta name="Copyright" content="Copyright (C) 2005-2015, Mike Pall"> | 7 | <meta name="Copyright" content="Copyright (C) 2005-2015, Mike Pall"> |
| @@ -17,7 +17,7 @@ ul li { padding-bottom: 0.3em; } | |||
| 17 | <a href="http://luajit.org"><span>Lua<span id="logo">JIT</span></span></a> | 17 | <a href="http://luajit.org"><span>Lua<span id="logo">JIT</span></span></a> |
| 18 | </div> | 18 | </div> |
| 19 | <div id="head"> | 19 | <div id="head"> |
| 20 | <h1>Status & Roadmap</h1> | 20 | <h1>Status</h1> |
| 21 | </div> | 21 | </div> |
| 22 | <div id="nav"> | 22 | <div id="nav"> |
| 23 | <ul><li> | 23 | <ul><li> |
| @@ -104,15 +104,6 @@ handled correctly. The error may fall through an on-trace | |||
| 104 | garbage collector. | 104 | garbage collector. |
| 105 | </li> | 105 | </li> |
| 106 | </ul> | 106 | </ul> |
| 107 | |||
| 108 | <h2>Roadmap</h2> | ||
| 109 | <p> | ||
| 110 | Please refer to the | ||
| 111 | <a href="http://www.freelists.org/post/luajit/LuaJIT-Roadmap-20122013"><span class="ext">»</span> LuaJIT Roadmap 2012/2013</a> and an | ||
| 112 | <a href="http://www.freelists.org/post/luajit/LuaJIT-Roadmap-20122013-UPDATE"><span class="ext">»</span> update on release planning</a> for details. | ||
| 113 | </p> | ||
| 114 | <p> | ||
| 115 | </p> | ||
| 116 | <br class="flush"> | 107 | <br class="flush"> |
| 117 | </div> | 108 | </div> |
| 118 | <div id="foot"> | 109 | <div id="foot"> |