Module Name:	pkgsrc
Committed By:	ghen
Date:		Wed Nov 22 12:48:30 UTC 2006

Modified Files:
	pkgsrc/www/seamonkey: DESCR Makefile Makefile-seamonkey.common PLIST
	    distinfo
	pkgsrc/www/seamonkey/patches: patch-ab patch-ap patch-ax
Removed Files:
	pkgsrc/www/seamonkey/patches: patch-at

Log Message:
Resolve conflicts.  I should have cvs add'ed this instead of cvs import'ing, as
wip/seamonkey has already existed in pkgsrc-wip.


To generate a diff of this commit:
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/www/seamonkey/DESCR
cvs rdiff -r1.13 -r1.14 pkgsrc/www/seamonkey/Makefile
cvs rdiff -r1.2 -r1.3 pkgsrc/www/seamonkey/Makefile-seamonkey.common
cvs rdiff -r1.4 -r1.5 pkgsrc/www/seamonkey/PLIST
cvs rdiff -r1.14 -r1.15 pkgsrc/www/seamonkey/distinfo
cvs rdiff -r1.3 -r1.4 pkgsrc/www/seamonkey/patches/patch-ab
cvs rdiff -r1.1.1.1 -r1.2 pkgsrc/www/seamonkey/patches/patch-ap \
    pkgsrc/www/seamonkey/patches/patch-ax
cvs rdiff -r1.1 -r0 pkgsrc/www/seamonkey/patches/patch-at

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.