diff options
| author | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
|---|---|---|
| committer | gnhb <gnoahb@gmail.com> | 2010-05-21 07:34:23 +0700 |
| commit | d9e2c1714bc55f546702a8660f62e8cff2716aa4 (patch) | |
| tree | 069b2f5369ad4bf9c7e60806b47f5dd42e409c78 /etc/inc/config.inc | |
| parent | 30ade8461e65922c8d8a22d3b9ba5b07bb2912e0 (diff) | |
| parent | c0ed686f9441b7019722954020057b23fe2f6603 (diff) | |
| download | pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.zip pfsense-d9e2c1714bc55f546702a8660f62e8cff2716aa4.tar.gz | |
Merge branch 'master' of http://gitweb.pfsense.org/pfsense/mainline into mlppp
Conflicts:
usr/local/www/interfaces.php
Not sure why there was a conflict since the last change to this file was May 20.
Diffstat (limited to 'etc/inc/config.inc')
| -rw-r--r-- | etc/inc/config.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/config.inc b/etc/inc/config.inc index 1dd0d9a..5ec98be 100644 --- a/etc/inc/config.inc +++ b/etc/inc/config.inc @@ -54,10 +54,10 @@ if($g['booting']) echo "."; ini_set("memory_limit","128M"); /* include globals from notices.inc /utility/XML parser files */ -require_once('config.lib.inc'); -if($g['booting']) echo "."; require_once("notices.inc"); if($g['booting']) echo "."; +require_once('config.lib.inc'); +if($g['booting']) echo "."; require_once("util.inc"); if($g['booting']) echo "."; if(file_exists("/cf/conf/use_xmlreader")) |
