Conflicts fix for 64-bit SHS fix
authorAri Johnson <ari@cobramush.org>
Mon, 9 Apr 2007 11:33:34 +0000 (11:33 +0000)
committerAri Johnson <ari@cobramush.org>
Mon, 9 Apr 2007 11:33:34 +0000 (11:33 +0000)
commit0676da0b801cc6754fbbe50f361d7b0cdf54c8b2
tree9564d499909819ded85f1c7b08c6673b39665e73
parentf432dba0ddc3ac03ee4ac589976bb1eef285c02f
Conflicts fix for 64-bit SHS fix
hdrs/shs.h