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)
commit117ff57fc64bb66967aeebbc234e0b6fc9c71cd0
tree6007a94ce6d34440530a0b837b7b4acfce05f3dd
parent6e3c1e6a1ca693ec68c095c6b69db1f473b4f2c5
Fixed an update conflict.
trunk/gpgme/ChangeLog
trunk/gpgme/encrypt.c