pfsense/usr
Vinicius Coque 54bdff758f Merge remote-tracking branch 'mainline/master' into inc
Conflicts:
	etc/inc/auth.inc
	etc/inc/config.lib.inc
	etc/inc/filter.inc
	etc/inc/pfsense-utils.inc
	etc/inc/pkg-utils.inc
	etc/inc/priv.defs.inc
	etc/inc/services.inc
	etc/inc/shaper.inc
	etc/inc/voucher.inc
	etc/inc/vpn.inc
	usr/local/www/fbegin.inc
2011-03-25 08:49:04 -03:00
..
local Merge remote-tracking branch 'mainline/master' into inc 2011-03-25 08:49:04 -03:00
sbin Correct path 2010-12-17 23:56:31 -05:00
share Move the skel dir to /etc/skel, where it's easier to manage from a build point of view. 2010-07-06 13:55:10 -04:00