Date: Wednesday, June 4, 2003 @ 09:30:54 Author: werner Path: /cvs/gnupg/libgpg-error/src Modified: err-codes.h.in err-sources.h.in gpg-error.h solved conflicts ------------------+ err-codes.h.in | 5 +++++ err-sources.h.in | 1 + gpg-error.h | 12 ++++++++---- 3 files changed, 14 insertions(+), 4 deletions(-)