Merge tag 'nasm-2.13.03'
commit1b53750430f03e5953e6b133d6dbae237c3f880f
authorH. Peter Anvin <hpa@linux.intel.com>
Wed, 7 Feb 2018 21:51:54 +0000 (7 13:51 -0800)
committerH. Peter Anvin <hpa@linux.intel.com>
Wed, 7 Feb 2018 21:51:54 +0000 (7 13:51 -0800)
treee8934dae69b539c48d7f63a2276b8fbcc8bc9b25
parent70c439b8de78595e9a465e3907aa282aa9c82984
parentef7d18bfbb899fe8e44f4fae8d6a12e2742f69f5
Merge tag 'nasm-2.13.03'

NASM 2.13.03

Resolved Conflicts:
include/iflag.h
version
x86/insns-iflags.ph

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
asm/assemble.c
asm/directiv.c
asm/nasm.c
include/iflag.h
include/insns.h