Merge tag 'nasm-2.13.01'
commit7f419dff4ee2d15fdc6937050c9424ae111e9b2b
authorH. Peter Anvin <hpa@zytor.com>
Tue, 2 May 2017 18:46:34 +0000 (2 11:46 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Tue, 2 May 2017 18:46:34 +0000 (2 11:46 -0700)
tree88f6080b5cee9b958876e9fb7f57a613db2cc1f2
parent2fbc727078403c8ecad428a1ecefe9a9a95cb2c3
parent13ff7f92ecca0e8e62eb1e1d19d9c99de1f8f6da
Merge tag 'nasm-2.13.01'

NASM 2.13.01

Resolved Conflicts:
include/insns.h