c7e398e0c6
@conflict markers, the @pkgpath markers should also indicate what's going on. |
||
---|---|---|
.. | ||
DESCR-aalib | ||
DESCR-caca | ||
DESCR-dv | ||
DESCR-gdk | ||
DESCR-main | ||
DESCR-soup | ||
PLIST-aalib | ||
PLIST-caca | ||
PLIST-dv | ||
PLIST-gdk | ||
PLIST-main | ||
PLIST-soup |