Adam Weinberger 3f9e29f7d8 *sigh* This is why even cursory inspections of diffs is a good ... idea. Remove the re-added CVS conflict lines.		2005-04-12 04:22:45 +00:00
..
files	- Update to version 2.2.9	2004-03-01 18:11:28 +00:00
distinfo	- Update to version 2.2.9	2004-03-01 18:11:28 +00:00
Makefile	*sigh* This is why even cursory inspections of diffs is a good	2005-04-12 04:22:45 +00:00
pkg-descr	Per distfile survey, old mastersite disappeared: just use the master	2004-03-22 15:46:52 +00:00
pkg-plist	Support WITHOUT_NLS	2004-03-25 11:42:35 +00:00