diff options
author | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-30 17:14:36 -0700 |
---|---|---|
committer | H. Peter Anvin (Intel) <hpa@zytor.com> | 2020-06-30 17:14:36 -0700 |
commit | a3db726f02be8ac285f51106070a04aca7ab0142 (patch) | |
tree | be35b568bba4a7b41008e391e6ab13bc3bd3ecf5 /travis/test/align13.stderr | |
parent | 367350319b8c5d2a79f400915d7a51be9cb98209 (diff) | |
parent | 8877a3ddb08e5cb7cd60704380ccccb5bb5c36b2 (diff) | |
download | nasm-a3db726f02be8ac285f51106070a04aca7ab0142.tar.gz |
Merge remote-tracking branch 'github/nasm-2.15.xx'
Resolved Conflicts:
version
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
Diffstat (limited to 'travis/test/align13.stderr')
0 files changed, 0 insertions, 0 deletions