| commit | da8659dfd0e71abdc6e329fbe90172daf72e855e | |
| author | H. Peter Anvin <hpa@zytor.com> | |
| Tue, 4 Oct 2016 07:30:17 +0000 (4 00:30 -0700) | ||
| committer | H. Peter Anvin <hpa@zytor.com> | |
| Tue, 4 Oct 2016 07:30:17 +0000 (4 00:30 -0700) | ||
| tree | 57e03ab250c0bf489df3baddc495a3c5af892836 | treesnapshot (tar.gz zip) |
| parent | 55568c1193df3c0e68c644c5818658b0d37a5d69 | commitdiff |
| parent | ce63783e85d79d8d21582c3458e2d7c7f8b77802 | commitdiff |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Resolved Conflicts:
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Resolved Conflicts:
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| asm/assemble.c | diff1 | diff2 | blobhistory |
| x86/insns-iflags.pl | diff1 | diff2 | blobhistory |
| x86/insns.dat | diff1 | diff2 | blobhistory |