| commit | 70d0458050f654c2f55993a200bcd351b1e310e7 | |
| author | H. Peter Anvin <hpa@linux.intel.com> | |
| Tue, 15 Nov 2016 20:00:23 +0000 (15 12:00 -0800) | ||
| committer | H. Peter Anvin <hpa@linux.intel.com> | |
| Tue, 15 Nov 2016 20:00:23 +0000 (15 12:00 -0800) | ||
| tree | 1853e5a09dea0b1ff1e5e175fb1d5efc23e1bc78 | treesnapshot (tar.gz zip) |
| parent | ed347369aeeb6ff7338249a967bd292ee78debc5 | commitdiff |
| parent | 456b1c46f8414f4e928f813d76b031042dbcc3dd | commitdiff |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Resolved Conflicts:
output/outelf32.c
output/outelf64.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Resolved Conflicts:
output/outelf32.c
output/outelf64.c
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| x86/insns.dat | diff1 | diff2 | blobhistory |