/sysutils/etcmerge/

	Commit message (Expand)	Author	Age	Files	Lines
*	Remove CONFLICTS with updated thttpd	ache	2007-06-15	1	-2/+2
*	Fix build when custom LC_ALL is set	ache	2007-05-31	1	-1/+10
*	Fix objformat problem	ache	2007-04-04	2	-5/+20
*	Replace	ache	2006-12-10	2	-3/+2
*	Use more rcNG compatible method for limits(1)	ache	2006-08-10	2	-2/+3
*	Upgrade to 1.3.37	ache	2006-07-29	3	-17/+5
*	Security fix: off-by-one error in mod_rewrite	ache	2006-07-27	2	-0/+12
*	Upgrade to 1.3.36	ache	2006-05-18	2	-5/+5
*	Upgrade to 1.3.35	ache	2006-05-10	3	-41/+5
*	Remove the FreeBSD KEYWORD from all rc.d scripts where it appears.	dougb	2006-02-21	1	-1/+1
*	Chase shlib bump of libexpat.	kuriyama	2006-01-31	1	-2/+2
*	Quench pkg_delete warning	kris	2006-01-26	1	-1/+1
*	SHA256ify	edwin	2006-01-24	1	-0/+1
*	CVE-2005-3352	ache	2005-12-15	2	-1/+36
*	Back out rc transition, now all script executed in the subshell	ache	2005-12-05	2	-14/+4
*	Fix my suggested patch by making it PLIST_SUB+=	dougb	2005-12-03	1	-1/+1
*	Tune for new rc.d convention	ache	2005-12-03	2	-3/+14
*	big whitespace cleanup (see ports/65409)	edwin	2005-11-25	1	-17/+17
*	Upgrade to 1.3.34	ache	2005-10-19	4	-92/+5
*	Fix http request smuggling for proxy	ache	2005-08-11	2	-1/+88
*	- don't create httpd.conf.bak	clement	2005-02-12	2	-0/+16
*	Change APACHE_PERF_TUNING default to more reasonable value	ache	2005-01-30