| commit | 6224033738437c4d61a54b9142f82728288ecdfb | |
| author | H. Peter Anvin <hpa@zytor.com> | |
| Mon, 7 Mar 2016 20:15:40 +0000 (7 12:15 -0800) | ||
| committer | H. Peter Anvin <hpa@zytor.com> | |
| Mon, 7 Mar 2016 20:15:40 +0000 (7 12:15 -0800) | ||
| tree | fdef91ebe5d53341929b98820ffe63b24aff5d16 | treesnapshot (tar.gz zip) |
| parent | 0b7969e9a95f2ed7c791ddde87a0a8ab2bb9d5d4 | commitdiff |
| parent | 172b840aa35d7018509036a3a7d3c467b331f73c | commitdiff |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Resolved Conflicts:
.gitignore
Makefile.in
assemble.c
configure.in
eval.c
float.c
listing.c
nasm.c
nasmlib.c
output/outform.h
preproc.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Resolved Conflicts:
.gitignore
Makefile.in
assemble.c
configure.in
eval.c
float.c
listing.c
nasm.c
nasmlib.c
output/outform.h
preproc.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
18 files changed: