diff options
| author | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-19 07:06:12 +0000 |
|---|---|---|
| committer | florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-10-19 07:06:12 +0000 |
| commit | c007d6e1cc195068301ddd1e49680c14dd856b5a (patch) | |
| tree | 9ef7012ca58ef214cfebcb340830e1285f3c3418 /feeds.conf.default | |
| parent | cbf1b1846803675b33c708e5bd695a423928438b (diff) | |
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
Diffstat (limited to 'feeds.conf.default')
0 files changed, 0 insertions, 0 deletions