werner committed to gnupg/g10

[cvs@cvs.gnupg.org]

Date:	Sunday March 3, 2002 @ 15:08
Author:	werner

Update of /cvs/gnupg/gnupg/g10
In directory trithemius:/tmp/cvs-serv9157

Modified Files:
      Tag: STABLE-BRANCH-1-0
	ChangeLog parse-packet.c 
Log Message:
Solved conflict

File: ChangeLog        	Status: Up-to-date
File: parse-packet.c   	Status: Up-to-date