| commit | ece809789eed9c488d19a2eb5704130ba6377cb9 | |
| author | H. Peter Anvin <hpa@linux.intel.com> | |
| Wed, 1 Nov 2017 17:37:18 +0000 (1 10:37 -0700) | ||
| committer | H. Peter Anvin <hpa@linux.intel.com> | |
| Wed, 1 Nov 2017 17:37:18 +0000 (1 10:37 -0700) | ||
| tree | bab0c9d9731169411f51d15f7e4290be99f39ad4 | treesnapshot (tar.gz zip) |
| parent | 120819e73c33b316bfe02e2bacdd22108763a12b | commitdiff |
| parent | 9b7ee09abfd426b99aa1ea81d19a3b2818eeabf9 | commitdiff |
Merge remote-tracking branch 'origin/nasm-2.13.xx'
Resolved conflicts:
version
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Resolved conflicts:
version
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>