Merge branch 'master' into hmac_support
authorMichael Rash <mbr@cipherdyne.org>
Sun, 5 Aug 2012 17:26:43 +0000 (13:26 -0400)
committerMichael Rash <mbr@cipherdyne.org>
Sun, 5 Aug 2012 17:26:43 +0000 (13:26 -0400)
1  2 
configure.ac
lib/fko.h

diff --cc configure.ac
Simple merge
diff --cc lib/fko.h
Simple merge