Fixed an update conflict.
authorWerner Koch <wk@gnupg.org>
Thu, 1 Aug 2002 10:16:21 +0000 (10:16 +0000)
committerWerner Koch <wk@gnupg.org>
Thu, 1 Aug 2002 10:16:21 +0000 (10:16 +0000)
commitb94497bf1f9e5b28767b992dd14a624809421801
tree2d99caf8b724ccce9e99ecc12b1220dd97ee3bfd
parent6676c74b6afd6aece8988c19c7b67cda9031efa2
Fixed an update conflict.
gpgme/ChangeLog
gpgme/encrypt.c