| commit | 5282cea85b964705fa3a66f535fa2672f6e055cd | |
| author | H. Peter Anvin <hpa@zytor.com> | |
| Thu, 6 Jun 2019 23:26:22 +0000 (6 16:26 -0700) | ||
| committer | H. Peter Anvin <hpa@zytor.com> | |
| Thu, 6 Jun 2019 23:26:22 +0000 (6 16:26 -0700) | ||
| tree | 7ce907ff6ab5d598febd19c55c5e5af460e7a71c | treesnapshot (tar.gz zip) |
| parent | 249c21707020df813f967550c12b59cab7e026d6 | commitdiff |
| parent | 0995aa24aa7999a98f54c66ad989b47ce9a41e78 | commitdiff |
Merge branch 'master' of ssh://repo.or.cz/nasm
Resolved Conflicts:
asm/preproc.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Resolved Conflicts:
asm/preproc.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| asm/preproc.c | diff1 | diff2 | blobhistory |
| asm/quote.c | diff1 | diff2 | blobhistory |
| asm/quote.h | diff1 | diff2 | blobhistory |
| include/nasmlib.h | diff1 | diff2 | blobhistory |