Merge remote-tracking branch 'origin/nasm-2.12.xx'

Browse Source

Bring the branches in sync.

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

Resolved Conflicts:
	Makefile.in
	Mkfiles/msvc.mak
	Mkfiles/netware.mak
	Mkfiles/openwcom.mak
	Mkfiles/owlinux.mak
	asm/assemble.c

...

This commit is contained in:

H. Peter Anvin

2016-09-20 16:51:19 -07:00

parent 637b9cc581 976ba73062

commit e8b01c6f72

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available