Seth Mos fcdc894353 Merge remote branch 'upstream/master' ... Conflicts: etc/inc/pfsense-utils.inc		2011-04-28 11:33:48 +02:00
..
bin	Swap if statement, add fields into ipsecpinghosts file	2011-03-16 13:28:39 +01:00
captiveportal	ipfw is not referenced here.	2011-03-15 12:53:36 +00:00
pkg	Add GUI option to CARP settings for syncing certs. It was in the backend code but not the GUI. Fixes #1316	2011-03-02 08:57:58 -05:00
sbin	Rework ntpdate_sync_once.sh, so it makes sure ntp/ntpdate/itself are not running before trying to sync time, and then launch ntpd at the end for time sync (last commit was premature)	2011-04-08 11:46:30 -04:00
share
www	Merge remote branch 'upstream/master'	2011-04-28 11:33:48 +02:00