diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2018-02-20 12:40:11 -0800 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2018-02-20 12:40:11 -0800 |
| commit | 4dbf3a96a4b17add396ea4592a7fde7cb8083d52 (patch) | |
| tree | f515b64b818a27bddac200cb8428cc47c8297a76 /configure.ac | |
| parent | 99d45c850e3962e4c89839dd8531de1c080b3ee7 (diff) | |
| parent | f71820d6055373c9b9381615e28a28f307bb2df4 (diff) | |
| download | nasm-4dbf3a96a4b17add396ea4592a7fde7cb8083d52.tar.gz | |
Merge remote-tracking branch 'origin/nasm-2.13.xx'
Resolved Conflicts:
version
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions