Merge branch 'master' of git://nbd.name/openwrt
authorflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 19 Oct 2010 07:06:12 +0000 (07:06 +0000)
committerflorian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Tue, 19 Oct 2010 07:06:12 +0000 (07:06 +0000)
commitc007d6e1cc195068301ddd1e49680c14dd856b5a
tree9ef7012ca58ef214cfebcb340830e1285f3c3418
parentcbf1b1846803675b33c708e5bd695a423928438b
Merge branch 'master' of git://nbd.name/openwrt

Conflicts:

package/opkg/patches/009-remove-upgrade-all.patch

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@23532 3c298f89-4303-0410-b956-a3cf2f4a3e73
package/opkg/patches/009-remove-upgrade-all.patch [new file with mode: 0644]
This page took 0.031047 seconds and 4 git commands to generate.