Merge r4338-r4341
authorJo-Philipp Wich <jow@openwrt.org>
Mon, 16 Mar 2009 17:57:27 +0000 (17:57 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Mon, 16 Mar 2009 17:57:27 +0000 (17:57 +0000)
commit0bdf302f9f83726ea54954bf05fd7446fdf3c874
tree9ec3771bb114e45dff80ea8c2be1b340ed71e055
parent907f27f8b21919ba41be6b8ef212d8669dafccc9
Merge r4338-r4341
applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
applications/luci-olsr/luasrc/i18n/olsr.de.lua
applications/luci-olsr/luasrc/i18n/olsr.en.lua
applications/luci-olsr/luasrc/model/cbi/olsr/olsrdplugins.lua
contrib/package/olsrd-luci/Makefile
contrib/package/olsrd-luci/patches/150-add-watchdog.patch [new file with mode: 0644]
modules/freifunk/root/etc/config/freifunk
modules/freifunk/root/etc/init.d/freifunk
modules/freifunk/root/usr/sbin/ff_olsr_watchdog [new file with mode: 0755]