| commit | a87c5e4c872b9a28f03b786b95c23d07696d1eaf | |
| author | H. Peter Anvin <hpa@zytor.com> | |
| Tue, 17 May 2016 04:24:26 +0000 (16 21:24 -0700) | ||
| committer | H. Peter Anvin <hpa@zytor.com> | |
| Tue, 17 May 2016 04:27:33 +0000 (16 21:27 -0700) | ||
| tree | 5d7457a04ba30c68e63d7800a8411ef168672231 | treesnapshot (tar.gz zip) |
| parent | 2c9b6ad3d9da2e57e695fd4ae2d612bd83aecaf4 | commitdiff |
| parent | acbf8f0e1972eb690c91c5bca5b8c1c960dde4b5 | commitdiff |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
Resolved Conflicts:
.gitignore
Makefile.in
Mkfiles/msvc.mak
Mkfiles/netware.mak
Mkfiles/openwcom.mak
Mkfiles/owlinux.mak
preproc-nop.c
preproc.c
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Resolved Conflicts:
.gitignore
Makefile.in
Mkfiles/msvc.mak
Mkfiles/netware.mak
Mkfiles/openwcom.mak
Mkfiles/owlinux.mak
preproc-nop.c
preproc.c
version
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
19 files changed: