diff options
author | Matt Johnston <matt@ucc.asn.au> | 2007-02-06 16:00:18 +0000 |
---|---|---|
committer | Matt Johnston <matt@ucc.asn.au> | 2007-02-06 16:00:18 +0000 |
commit | cda7af7ca2fe9fb8d848e7891a528e63531a4e8d (patch) | |
tree | 936cdb192e15a456a67d52ab439841b4610404c2 /libtomcrypt/src/mac/pelican/pelican_memory.c | |
parent | d199e0b1196f39509a92e31d6843193d828bcfab (diff) | |
parent | b1217873364b9c6aa974462b466a795f224249f3 (diff) |
merge of '73fe066c5d9e2395354ba74756124d45c978a04d'
and 'f5014cc84558f1e8eba42dbecf9f72f94bfe6134'
--HG--
branch : channel-fix
extra : convert_revision : cc6095ce978e5f9e51ece6f1717499bc73594bcc
Diffstat (limited to 'libtomcrypt/src/mac/pelican/pelican_memory.c')
-rw-r--r-- | libtomcrypt/src/mac/pelican/pelican_memory.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libtomcrypt/src/mac/pelican/pelican_memory.c b/libtomcrypt/src/mac/pelican/pelican_memory.c index 093340d..7dde843 100644 --- a/libtomcrypt/src/mac/pelican/pelican_memory.c +++ b/libtomcrypt/src/mac/pelican/pelican_memory.c @@ -6,7 +6,7 @@ * The library is free for all purposes without any express * guarantee it works. * - * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.org + * Tom St Denis, tomstdenis@gmail.com, http://libtomcrypt.com */ #include "tomcrypt.h" @@ -55,5 +55,5 @@ int pelican_memory(const unsigned char *key, unsigned long keylen, #endif /* $Source: /cvs/libtom/libtomcrypt/src/mac/pelican/pelican_memory.c,v $ */ -/* $Revision: 1.5 $ */ -/* $Date: 2005/05/05 14:35:59 $ */ +/* $Revision: 1.6 $ */ +/* $Date: 2006/03/31 14:15:35 $ */ |