| commit | e8b01c6f727a7fb546777258853d44cb72d766d7 | |
| author | H. Peter Anvin <hpa@linux.intel.com> | |
| Tue, 20 Sep 2016 23:51:19 +0000 (20 16:51 -0700) | ||
| committer | H. Peter Anvin <hpa@linux.intel.com> | |
| Tue, 20 Sep 2016 23:51:19 +0000 (20 16:51 -0700) | ||
| tree | fdac9fc1042fca919e0f5d6c4e33e0e4658b26f2 | treesnapshot (tar.gz zip) |
| parent | 637b9cc58196b61656e8ab7855d4d6fcb87a2840 | commitdiff |
| parent | 976ba730622ae7c2d5e88d4fb4477ff96c1cd3f4 | commitdiff |
Merge remote-tracking branch 'origin/nasm-2.12.xx'
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
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