Merge remote-tracking branch 'origin/nasm-2.13.xx' into nasm-2.13.xx

Resolved Conflicts:
	include/iflag.h

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin 2018-02-06 14:50:08 -08:00
commit d08b1c4370

View file

@ -1 +1 @@
2.13.03rc3
2.13.03rc4