Commit 6165d6c

H. Peter Anvin

committed

Merge remote-tracking branch 'github/nasm-2.16.xx'

Resolved Conflicts: doc/changes.src

2 parents 3334c3c + 68d5993 commit 6165d6cCopy full SHA for 6165d6c

2 files changed

+334

-140

lines changed

+334

-140

lines changed

Comments

(0)