H. Peter Anvin
|
a87c5e4c87
|
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>
|
2016-05-16 21:27:33 -07:00 |
|