]> granicus.if.org Git - yasm/commitdiff
Merge [1511] and [1512] from trunk.
authorPeter Johnson <peter@tortall.net>
Wed, 26 Apr 2006 06:37:12 +0000 (06:37 -0000)
committerPeter Johnson <peter@tortall.net>
Wed, 26 Apr 2006 06:37:12 +0000 (06:37 -0000)
svn path=/branches/yasm-0.5.x/; revision=1513

1  2 
libyasm/hamt.c

diff --cc libyasm/hamt.c
Simple merge