| commit | 727c85263fd07dd2a4db77f17a2b2dfbdca79458 | |
| author | H. Peter Anvin (Intel) <hpa@zytor.com> | |
| Fri, 14 Dec 2018 21:23:17 +0000 (14 13:23 -0800) | ||
| committer | H. Peter Anvin (Intel) <hpa@zytor.com> | |
| Fri, 14 Dec 2018 21:24:19 +0000 (14 13:24 -0800) | ||
| tree | 83bce529ba35e7fbdc4825e40eb8c2b221c139fc | treesnapshot (tar.gz zip) |
| parent | b79b72fc254941c068d34fa2293bb9dba45c3501 | commitdiff |
| parent | bc7f5fd93c55ef9fdb5e6c0ef7403a383bee841e | commitdiff |
Merge tag 'nasm-2.14.01rc5'
NASM 2.14.01rc5
Resolved Conflicts:
asm/labels.c
asm/nasm.c
version
NASM 2.14.01rc5
Resolved Conflicts:
asm/labels.c
asm/nasm.c
version
| asm/labels.c | diff1 | diff2 | blobhistory |
| asm/nasm.c | diff1 | diff2 | blobhistory |
| asm/preproc-nop.c | diff1 | diff2 | blobhistory |
| asm/preproc.c | diff1 | diff2 | blobhistory |
| doc/nasmdoc.src | diff1 | diff2 | blobhistory |