diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-01-28 17:32:17 -0200 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2011-01-28 17:32:17 -0200 |
| commit | 9d3d8d005ec74d6108aa423c7ad09e0b58951127 (patch) | |
| tree | f765cfb57d7d75ac2af8fa6b975ea953b557bdfc /etc/inc/xmlreader.inc | |
| parent | b638ef519a8e1ad3e843c55e091fc2649e834797 (diff) | |
| parent | 1596d9c17349f47ef06defa5c44333db0158a110 (diff) | |
| download | pfsense-9d3d8d005ec74d6108aa423c7ad09e0b58951127.zip pfsense-9d3d8d005ec74d6108aa423c7ad09e0b58951127.tar.gz | |
Merge branch 'master' into inc
Conflicts:
etc/inc/captiveportal.inc
etc/inc/config.console.inc
etc/inc/config.lib.inc
etc/inc/easyrule.inc
etc/inc/filter.inc
etc/inc/ipsec.inc
etc/inc/pkg-utils.inc
etc/inc/shaper.inc
etc/inc/system.inc
etc/inc/voucher.inc
Diffstat (limited to 'etc/inc/xmlreader.inc')
| -rw-r--r-- | etc/inc/xmlreader.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/xmlreader.inc b/etc/inc/xmlreader.inc index 173a59f..1caa6ea 100644 --- a/etc/inc/xmlreader.inc +++ b/etc/inc/xmlreader.inc @@ -51,7 +51,7 @@ function listtags() { "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" + "tunnel user vip virtual_server vlan winsserver wolentry widget npt" ); return array_flip($ret); } |
