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@theari.com>
Thu, 24 Mar 2011 15:58:45 +0000 (15:58 +0000)
commit61d7830b9dd75670f9f549ffeb33c300a2383293
tree16d2bff41115820920e40f2ab7edf7bc28003930
parentf1ef2b3ed3df0c2cf42f3aef9eb53edededdc306
Conflicts fix for 64-bit SHS fix
(cherry picked from commit 0676da0b801cc6754fbbe50f361d7b0cdf54c8b2)
hdrs/shs.h