CVSROOT: /cvs
Module name: ports
Changes by: es...@cvs.openbsd.org 2009/12/14 04:36:26
Modified files:
multimedia/gstreamer-0.10/plugins-bad/pkg: PLIST-main
PLIST-mjpeg
multimedia/gstreamer-0.10/plugins-good: Makefile
multimedia/gstreamer-0.10/plugins-good/pkg: PLIST-main
multimedia/gstreamer-0.10/plugins-ugly: Makefile
multimedia/gstreamer-0.10/plugins-ugly/pkg: PLIST-main
Log message:
fix merge disaster: to merge subpackages together, it's not enough to put
@conflict markers, the @pkgpath markers should also indicate what's going on.
