Merge tag 'nasm-2.15'
commit513e19c8da06745525492b58795d8d8caa545049
authorH. Peter Anvin (Intel) <hpa@zytor.com>
Sat, 27 Jun 2020 22:36:59 +0000 (27 15:36 -0700)
committerH. Peter Anvin (Intel) <hpa@zytor.com>
Sat, 27 Jun 2020 22:36:59 +0000 (27 15:36 -0700)
treeda6c947aa0aff1a4fd00ee538e14d64e827166f3
parentf53966af8b81d7ef11f46f084a4f91e9faa55914
parenta825b33423d5046dfc4c0992c3ebfea5b8a531c4
Merge tag 'nasm-2.15'

NASM 2.15

Resolved Conflicts:
version