diff options
| author | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
|---|---|---|
| committer | Mike Pall <mike> | 2015-01-06 00:12:45 +0100 |
| commit | 0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535 (patch) | |
| tree | 79adfce53c856e0b066683352fd95cb40c97b3c5 /dynasm/dasm_arm.lua | |
| parent | c71cdf4c36145dd052734779d297fdbd7455468f (diff) | |
| parent | 86913b9bbf75c78a5dcfa2bf6071db8db7df7c51 (diff) | |
| download | luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.gz luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.tar.bz2 luajit-0a5045c34e0d2902e38c1f8f65c5bbc2fdc63535.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'dynasm/dasm_arm.lua')
| -rw-r--r-- | dynasm/dasm_arm.lua | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dynasm/dasm_arm.lua b/dynasm/dasm_arm.lua index d5078f7e..90a259c5 100644 --- a/dynasm/dasm_arm.lua +++ b/dynasm/dasm_arm.lua | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | ------------------------------------------------------------------------------ | 1 | ------------------------------------------------------------------------------ |
| 2 | -- DynASM ARM module. | 2 | -- DynASM ARM module. |
| 3 | -- | 3 | -- |
| 4 | -- Copyright (C) 2005-2014 Mike Pall. All rights reserved. | 4 | -- Copyright (C) 2005-2015 Mike Pall. All rights reserved. |
| 5 | -- See dynasm.lua for full copyright notice. | 5 | -- See dynasm.lua for full copyright notice. |
| 6 | ------------------------------------------------------------------------------ | 6 | ------------------------------------------------------------------------------ |
| 7 | 7 | ||