| commit | c4d75ddcbfb9093cfec7a5e0623f4a4ece3a14d3 | |
| author | H. Peter Anvin <hpa@zytor.com> | |
| Tue, 18 Apr 2017 23:07:18 +0000 (18 16:07 -0700) | ||
| committer | H. Peter Anvin <hpa@zytor.com> | |
| Tue, 18 Apr 2017 23:08:54 +0000 (18 16:08 -0700) | ||
| tree | 6138fc70ea706e1345c934cd42c486ee872466c1 | treesnapshot (tar.gz zip) |
| parent | e558dfd2498f581125b14a2e7abbac27fe5e7515 | commitdiff |
| parent | b68edcac72dc490bfba50bc144c0c6cce8c17b25 | commitdiff |
Merge branch 'master' into elf
Resolved Conflicts:
aclocal.m4
output/outelf.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Resolved Conflicts:
aclocal.m4
output/outelf.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
| aclocal.m4 | diff1 | diff2 | blobhistory |
| configure.ac | diff1 | diff2 | blobhistory |
| include/nasmlib.h | diff1 | diff2 | blobhistory |
| output/outelf.c | diff1 | diff2 | blobhistory |