Maho Nakata 2d4563fe62 Add conflict line. ... Submitted by: "b. f." <bf1783@googlemail.com>		2009-11-10 11:09:36 +00:00
..
files
distinfo
Makefile
pkg-descr
pkg-plist