[backfire] merge r23231
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 5 Oct 2010 07:43:34 +0000 (07:43 +0000)
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 5 Oct 2010 07:43:34 +0000 (07:43 +0000)
git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@23235 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/firewall/Makefile

index 81aff2240e039e66c379af1728f09c29004bb971..11dac8f415ad492de61b64ee2348d9fb8a4a3fd7 100644 (file)
@@ -32,6 +32,7 @@ endef
 
 define Package/firewall/conffiles
 /etc/config/firewall
+/etc/firewall.user
 endef
 
 define Package/firewall/install