diff options
| author | Mike Pall <mike> | 2014-01-16 23:18:34 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-01-16 23:18:34 +0100 |
| commit | a9d454360161d80310753dafa0d945eea4d98fde (patch) | |
| tree | 892e5802f261a8c4ac3de4d802b5881aed36eac1 /dynasm/dynasm.lua | |
| parent | ce9e8ed675d1fb7fe8e148a328fe0b892791a5f4 (diff) | |
| parent | ef59e5482055ed4477144518fc79a993288e855b (diff) | |
| download | luajit-a9d454360161d80310753dafa0d945eea4d98fde.tar.gz luajit-a9d454360161d80310753dafa0d945eea4d98fde.tar.bz2 luajit-a9d454360161d80310753dafa0d945eea4d98fde.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm/dynasm.lua')
| -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 3d04dcf8..2c0970d8 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-2013 Mike Pall. All rights reserved. | 5 | -- Copyright (C) 2005-2014 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 = [[ |
| 20 | Copyright (C) 2005-2013 Mike Pall. All rights reserved. | 20 | Copyright (C) 2005-2014 Mike Pall. All rights reserved. |
| 21 | 21 | ||
| 22 | Permission is hereby granted, free of charge, to any person obtaining | 22 | Permission is hereby granted, free of charge, to any person obtaining |
| 23 | a copy of this software and associated documentation files (the | 23 | a copy of this software and associated documentation files (the |