| commit | 66d561f2d94b9e28078776dc6eb7f67c3661df8d | |
| author | H. Peter Anvin <hpa@linux.intel.com> | |
| Thu, 16 Jun 2016 22:47:46 +0000 (16 15:47 -0700) | ||
| committer | H. Peter Anvin <hpa@linux.intel.com> | |
| Thu, 16 Jun 2016 22:47:46 +0000 (16 15:47 -0700) | ||
| tree | a679f783b9f626aca13c260edcc9e8339abc04d4 | treesnapshot (tar.gz zip) |
| parent | e1f985c167495185c55c46e640f2607604597383 | commitdiff |
| parent | 41d8a171952965f6a78b7e6a11cfeb9e3f5e43ad | commitdiff |
Merge tag 'nasm-2.12.02rc9'
NASM 2.12.02rc9
Resolved Conflicts:
asm/preproc.c
version
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
NASM 2.12.02rc9
Resolved Conflicts:
asm/preproc.c
version
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| asm/preproc.c | diff1 | diff2 | blobhistory |
| output/outmacho.c | diff1 | diff2 | blobhistory |
| output/outobj.c | diff1 | diff2 | blobhistory |