Florian Fainelli b55f4bdd60 Merge branch 'master' of git://nbd.name/openwrt ... Conflicts: package/opkg/patches/009-remove-upgrade-all.patch SVN-Revision: 23532		2010-10-19 07:06:12 +00:00
..
files	change from /jffs to /overlay, patch from Daniel Dickinson	2010-03-21 17:16:50 +00:00
patches	Merge branch 'master' of git://nbd.name/openwrt	2010-10-19 07:06:12 +00:00
Makefile	opkg: update to r576, remove 013add-list-changed-conffiles.patch - went upstream.	2010-10-05 07:26:49 +00:00