Merge remote-tracking branch 'origin/nasm-2.12.xx'
commite93572e6becbc68d3da0fb869c8feba8edafec47
authorH. Peter Anvin <hpa@linux.intel.com>
Tue, 4 Oct 2016 21:09:07 +0000 (4 14:09 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Tue, 4 Oct 2016 21:09:07 +0000 (4 14:09 -0700)
tree9dc9c820d253f29662b7e3aa6db3be933bb1aded
parent436e367874fc488a9d7e9196d1366715c4f05c05
parent3f87a2ac50b018ec463beaf702cb9779bdbe97b3
Merge remote-tracking branch 'origin/nasm-2.12.xx'
asm/pptok.dat
asm/preproc.c