summaryrefslogtreecommitdiffstats
path: root/etc/inc/easyrule.inc
diff options
context:
space:
mode:
authorRenato Botelho <renato.botelho@bluepex.com>2010-11-16 09:31:33 -0200
committerRenato Botelho <renato.botelho@bluepex.com>2010-11-16 09:31:33 -0200
commit39a8090a5a9ee447442ca6da154b0005b7e1bf80 (patch)
treefd327d4c1ebda352a39afdf83c0a9bf09f7c3b5f /etc/inc/easyrule.inc
parent129841508a5659a2c428213e0b231f9132fbfc4a (diff)
parente6b960ccffd51fd6a2ad190760f029608051f478 (diff)
downloadpfsense-39a8090a5a9ee447442ca6da154b0005b7e1bf80.zip
pfsense-39a8090a5a9ee447442ca6da154b0005b7e1bf80.tar.gz
Merge remote branch 'mainline/master' into inc
Conflicts: etc/inc/PEAR.inc etc/inc/filter.inc
Diffstat (limited to 'etc/inc/easyrule.inc')
-rw-r--r--etc/inc/easyrule.inc1
1 files changed, 1 insertions, 0 deletions
diff --git a/etc/inc/easyrule.inc b/etc/inc/easyrule.inc
index d834702..da1377d 100644
--- a/etc/inc/easyrule.inc
+++ b/etc/inc/easyrule.inc
@@ -329,4 +329,5 @@ function easyrule_parse_pass($int, $proto, $src, $dst, $dstport = 0) {
}
return gettext("Unknown pass error.");
}
+
?>
OpenPOWER on IntegriCloud