diff options
| author | Mike Pall <mike> | 2020-10-12 16:18:02 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2020-10-12 16:18:02 +0200 |
| commit | 1d8b747c161db457e032a023ebbff511f5de5ec2 (patch) | |
| tree | 7254328c720b104f5d5b4bd8321cfcb18c6fb6ce /dynasm | |
| parent | 675e08cf069725a004284b4e1e67fbf0e8fcb4dd (diff) | |
| parent | 050466552bf7eb8b7944aa52c93b45326ae14d7a (diff) | |
| download | luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.tar.gz luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.tar.bz2 luajit-1d8b747c161db457e032a023ebbff511f5de5ec2.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm')
| -rw-r--r-- | dynasm/dynasm.lua | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua index 8e85af24..b34124b7 100644 --- a/dynasm/dynasm.lua +++ b/dynasm/dynasm.lua | |||
| @@ -14,7 +14,7 @@ local _info = { | |||
| 14 | vernum = 10400, | 14 | vernum = 10400, |
| 15 | release = "2015-10-18", | 15 | release = "2015-10-18", |
| 16 | author = "Mike Pall", | 16 | author = "Mike Pall", |
| 17 | url = "http://luajit.org/dynasm.html", | 17 | url = "https://luajit.org/dynasm.html", |
| 18 | license = "MIT", | 18 | license = "MIT", |
| 19 | copyright = [[ | 19 | copyright = [[ |
| 20 | Copyright (C) 2005-2020 Mike Pall. All rights reserved. | 20 | Copyright (C) 2005-2020 Mike Pall. All rights reserved. |
| @@ -38,7 +38,7 @@ CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, | |||
| 38 | TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE | 38 | TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE |
| 39 | SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | 39 | SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. |
| 40 | 40 | ||
| 41 | [ MIT license: http://www.opensource.org/licenses/mit-license.php ] | 41 | [ MIT license: https://www.opensource.org/licenses/mit-license.php ] |
| 42 | ]], | 42 | ]], |
| 43 | } | 43 | } |
| 44 | 44 | ||