?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: 7214d18 140c214)
Merge branch 'nasm-2.12.xx'
commit83df633f07575e47755eb823265e83216856489e
authorH. Peter Anvin <hpa@zytor.com>
Wed, 2 Mar 2016 19:00:52 +0000 (2 11:00 -0800)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 2 Mar 2016 19:00:52 +0000 (2 11:00 -0800)
tree3c17d43f96b7805919878bc5bdc4b6d03170467ctree | snapshot (tar.gz zip)
parent7214d18b405f883010a74a3f8281c7906a5a21cacommit | diff
parent140c214ad04a51dab937cda1fe1ea4b9d60fb86dcommit | diff
Merge branch 'nasm-2.12.xx'

Resolved Conflicts:
output/outelf32.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
The Netwide Assembler