Merge remote-tracking branch 'origin/nasm-2.12.xx'
Bring the branches in sync. Signed-off-by: H. Peter Anvin <hpa@linux.intel.com> Resolved Conflicts: Makefile.in Mkfiles/msvc.mak Mkfiles/netware.mak Mkfiles/openwcom.mak Mkfiles/owlinux.mak asm/assemble.c
This commit is contained in:
commit
e8b01c6f72