aboutsummaryrefslogtreecommitdiff
path: root/dynasm/dynasm.lua
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 /dynasm/dynasm.lua
parentc94b921f924c1b37fea52e34f4e01ba8b37d77d0 (diff)
parentb93a1dd0c831cab22f98163d0dde792a493c0eef (diff)
downloadluajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.gz
luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.tar.bz2
luajit-71ff7ef8a7e0592dedb3527d4aacc68bf04af0bd.zip
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm/dynasm.lua')
-rw-r--r--dynasm/dynasm.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/dynasm/dynasm.lua b/dynasm/dynasm.lua
index 1e5899a4b..5ec21a797 100644
--- a/dynasm/dynasm.lua
+++ b/dynasm/dynasm.lua
@@ -2,7 +2,7 @@
2-- DynASM. A dynamic assembler for code generation engines. 2-- DynASM. A dynamic assembler for code generation engines.
3-- Originally designed and implemented for LuaJIT. 3-- Originally designed and implemented for LuaJIT.
4-- 4--
5-- Copyright (C) 2005-2016 Mike Pall. All rights reserved. 5-- Copyright (C) 2005-2017 Mike Pall. All rights reserved.
6-- See below for full copyright notice. 6-- See below for full copyright notice.
7------------------------------------------------------------------------------ 7------------------------------------------------------------------------------
8 8
@@ -17,7 +17,7 @@ local _info = {
17 url = "http://luajit.org/dynasm.html", 17 url = "http://luajit.org/dynasm.html",
18 license = "MIT", 18 license = "MIT",
19 copyright = [[ 19 copyright = [[
20Copyright (C) 2005-2016 Mike Pall. All rights reserved. 20Copyright (C) 2005-2017 Mike Pall. All rights reserved.
21 21
22Permission is hereby granted, free of charge, to any person obtaining 22Permission is hereby granted, free of charge, to any person obtaining
23a copy of this software and associated documentation files (the 23a copy of this software and associated documentation files (the