| commit | fbce0bfb4ebab9e790879a8f9c2e90aa21b6108f | |
| author | H. Peter Anvin <hpa@zytor.com> | |
| Thu, 17 Aug 2017 05:40:26 +0000 (16 22:40 -0700) | ||
| committer | H. Peter Anvin <hpa@zytor.com> | |
| Thu, 17 Aug 2017 05:41:40 +0000 (16 22:41 -0700) | ||
| tree | 26c04a738bea393bb72dde678dbd567f24b8cdbd | treesnapshot (tar.gz zip) |
| parent | 7180a51f478d9a8e6a2590288bf6fabaf7ff594a | commitdiff |
| parent | f275ce9c88164fc455870a7b654e76b3f84c420c | commitdiff |
Merge remote-tracking branch 'origin/nasm-2.13.xx'
Resolved Conflicts:
asm/directiv.dat
asm/preproc.c
misc/omfdump.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Resolved Conflicts:
asm/directiv.dat
asm/preproc.c
misc/omfdump.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| asm/assemble.c | diff1 | diff2 | blobhistory |
| asm/directiv.dat | diff1 | diff2 | blobhistory |
| include/nasm.h | diff1 | diff2 | blobhistory |
| include/nasmlib.h | diff1 | diff2 | blobhistory |