bernd 66f7d340be Add @conflict markers. robert@ will teach php4 how to use the pear port ... later. ok robert@		2007-05-07 13:46:59 +00:00
..
files	kill whitespace at eol, ok robert@	2005-02-06 13:10:38 +00:00
patches	upgrade to 4.4.0;	2005-07-12 15:49:27 +00:00
pkg	Add @conflict markers. robert@ will teach php4 how to use the pear port	2007-05-07 13:46:59 +00:00
Makefile	Add @conflict markers. robert@ will teach php4 how to use the pear port	2007-05-07 13:46:59 +00:00