diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-08 10:20:04 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-09-08 10:20:04 -0300 |
| commit | 8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b (patch) | |
| tree | cecf571643c08858880695d453d4f199649423f9 /etc/inc/xmlparse.inc | |
| parent | 86385ef36f81052afc3febdbce3a3af49373c7a6 (diff) | |
| parent | 245da5436bc5a30d6c65d68dbd54a56dca1ec896 (diff) | |
| download | pfsense-8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b.zip pfsense-8c04b1ae0a9bf0d41746824c3d34d24ba2d54d9b.tar.gz | |
Merge remote branch 'mainline/master' into inc
Conflicts:
etc/inc/filter.inc
etc/inc/pkg-utils.inc
etc/inc/service-utils.inc
etc/inc/system.inc
etc/inc/vpn.inc
Diffstat (limited to 'etc/inc/xmlparse.inc')
| -rw-r--r-- | etc/inc/xmlparse.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/xmlparse.inc b/etc/inc/xmlparse.inc index 013f81d..79bbad0 100644 --- a/etc/inc/xmlparse.inc +++ b/etc/inc/xmlparse.inc @@ -44,7 +44,7 @@ function listtags() { "lbaction lbpool l7rules lbprotocol ". "member menu tab mobilekey monitor_type mount ntpserver onetoone ". "openvpn-server openvpn-client openvpn-csc " . - "option ppp package passthrumac phase1 phase2 priv proxyarpnet qinqentry queue ". + "option package passthrumac phase1 phase2 ppp pppoe priv proxyarpnet qinqentry queue ". "pages pipe roll route row rrddatafile rule schedule service servernat servers ". "serversdisabled earlyshellcmd shellcmd staticmap subqueue timerange ". "tunnel user vip virtual_server vlan winsserver wolentry widget" |
