From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 24 May 2011 09:28:28 +0000 (+0000)
Subject: merge r26986
X-Git-Tag: backfire_10.03.1~245
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=92baf6bc55e7e944b94230bcb527a51b441e2a71;p=openwrt%2Fsvn-archive%2Fopenwrt.git

merge r26986

SVN-Revision: 26987
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 89be4a1c98..adb502b4cb 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=43.17
+PKG_RELEASE:=43.18
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
@@ -58,6 +58,7 @@ define Package/base-files/conffiles
 /etc/sysupgrade.conf
 /etc/config/
 /etc/dropbear/
+/etc/crontabs/
 $(call $(TARGET)/conffiles)
 endef