diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2016-03-08 01:08:53 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2016-03-08 01:08:53 -0800 |
| commit | 1917f45ec20fc6df405bcf2fcba5b1660e1b22d7 (patch) | |
| tree | 931f409972f065959223a5d24eace8d1015fb05d /rdoff | |
| parent | 63c42f08f70450f4e8f6f95603758f6e9b2d84a7 (diff) | |
| parent | 4bef68a84e1ddd2dad5ec895338bc4920c46a83b (diff) | |
| download | nasm-1917f45ec20fc6df405bcf2fcba5b1660e1b22d7.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Resolved Conflicts:
output/codeview.c
output/outelf32.c
output/outelf64.c
output/outelfx32.c
output/outform.c
output/outform.h
output/outieee.c
output/outobj.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'rdoff')
0 files changed, 0 insertions, 0 deletions