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 /src/lj_asm_x86.h | |
| 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 'src/lj_asm_x86.h')
| -rw-r--r-- | src/lj_asm_x86.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_asm_x86.h b/src/lj_asm_x86.h index c4c7300d..303d129f 100644 --- a/src/lj_asm_x86.h +++ b/src/lj_asm_x86.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* | 1 | /* |
| 2 | ** x86/x64 IR assembler (SSA IR -> machine code). | 2 | ** x86/x64 IR assembler (SSA IR -> machine code). |
| 3 | ** Copyright (C) 2005-2014 Mike Pall. See Copyright Notice in luajit.h | 3 | ** Copyright (C) 2005-2015 Mike Pall. See Copyright Notice in luajit.h |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | /* -- Guard handling ------------------------------------------------------ */ | 6 | /* -- Guard handling ------------------------------------------------------ */ |