Merge tag 'nasm-2.14.03rc1'
commitbd2803964e776b7e3cfa8292ed513aba32b1724c
authorH. Peter Anvin <hpa@zytor.com>
Thu, 27 Dec 2018 19:37:22 +0000 (27 11:37 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Thu, 27 Dec 2018 19:37:22 +0000 (27 11:37 -0800)
tree2ed9ea6bea86f551f9aa940606edfb2e95ed7a5c
parent2f0f5b01891a61b7b632c1704ecb3f27d561266a
parent81f98fe79be23174e2d6ddd9f17a5cfb9ca71ec7
Merge tag 'nasm-2.14.03rc1'

NASM 2.14.03rc1

Resolved Conflicts:
asm/labels.c
include/error.h

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
asm/labels.c
asm/nasm.c
include/error.h