Merge branch 'master' into fastpath

This commit is contained in:
Jon Siwek 2010-12-15 11:41:56 -06:00
commit 9880fd6281
5 changed files with 5 additions and 5 deletions

@ -1 +1 @@
Subproject commit c3c7ef0dfddb0746d3762e41086ba42928e68483 Subproject commit 2873ac642e2780cbbba3c0882423a75ca3350534

@ -1 +1 @@
Subproject commit 98f92eeb40281045159097764abddc428fb49bf2 Subproject commit 0a946b4d660fda37a868bb01974211df9cd48ac7

@ -1 +1 @@
Subproject commit 330cde879b51a88455a4f126cc65b21fb16f5420 Subproject commit 2a5e0d385e392f8b2212da5ab570d4600bbb8aa7

@ -1 +1 @@
Subproject commit 0b8ecaec3652ed2ea2bd7580062eabe5a1e051d1 Subproject commit df922e8a64a631aadb485b5044fe9ae1046d47ca

2
bro-path-dev.in Normal file → Executable file
View file

@ -17,4 +17,4 @@ broctlPolicies=${PROJECT_SOURCE_DIR}/aux/broctl/policy:${CMAKE_BINARY_DIR}/aux/b
installedPolicies=${POLICYDIR}:${POLICYDIR}/sigs:${POLICYDIR}/time-machine:${POLICYDIR}/site installedPolicies=${POLICYDIR}:${POLICYDIR}/sigs:${POLICYDIR}/time-machine:${POLICYDIR}/site
echo .:$distPolicies:$genPolicies:$broctlPolicies echo .:$broPolicies:$broGenPolicies:$broctlPolicies