espie c7e398e0c6 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.		2009-12-14 11:36:26 +00:00
..
patches	Major update to GStreamer plugins-ugly 0.10.13.	2009-11-29 09:17:54 +00:00
pkg	fix merge disaster: to merge subpackages together, it's not enough to put	2009-12-14 11:36:26 +00:00
distinfo	Major update to GStreamer plugins-ugly 0.10.13.	2009-11-29 09:17:54 +00:00
Makefile	fix merge disaster: to merge subpackages together, it's not enough to put	2009-12-14 11:36:26 +00:00