Merge tag 'nasm-2.12.02'
commit7e70f4dbb3ba85912300383c1d34bec303709654
authorH. Peter Anvin <hpa@linux.intel.com>
Thu, 14 Jul 2016 20:47:51 +0000 (14 13:47 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 14 Jul 2016 20:47:51 +0000 (14 13:47 -0700)
tree61b08c748a18858e7763a2fa949de1f1a0b237ff
parentf7606613d047ff37ead008263284e2bc1ae9ce93
parentf640b61d55e0c238883a2769540f7c7d946b5117
Merge tag 'nasm-2.12.02'

NASM 2.12.02

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
asm/nasm.c
asm/preproc.c