CVS commit: pkgsrc/graphics/giflib

["Matthias Drochner" <drochner%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   drochner
Date:           Tue Jan 18 11:57:54 UTC 2011

Modified Files:
        pkgsrc/graphics/giflib: buildlink3.mk
Added Files:
        pkgsrc/graphics/giflib: DESCR Makefile PLIST distinfo
        pkgsrc/graphics/giflib/patches: patch-aa

Log Message:
resolve conflicts


To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 pkgsrc/graphics/giflib/DESCR
cvs rdiff -u -r0 -r1.41 pkgsrc/graphics/giflib/Makefile
cvs rdiff -u -r0 -r1.4 pkgsrc/graphics/giflib/PLIST
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/graphics/giflib/buildlink3.mk
cvs rdiff -u -r0 -r1.6 pkgsrc/graphics/giflib/distinfo
cvs rdiff -u -r0 -r1.10 pkgsrc/graphics/giflib/patches/patch-aa

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