Merge branch 'master' of git+ssh://repo.or.cz/srv/git/nasm
authorH. Peter Anvin <hpa@zytor.com>
Wed, 21 May 2008 15:42:55 +0000 (08:42 -0700)
committerH. Peter Anvin <hpa@zytor.com>
Wed, 21 May 2008 15:42:55 +0000 (08:42 -0700)
1  2 
insns.dat

diff --cc insns.dat
Simple merge