mac80211: merge AP VLAN / WDS related fixes

[openwrt/svn-archive/archive.git] / feeds.conf.default

diff --git a/feeds.conf.default b/feeds.conf.default
index 853dcadb4668a18db50c9699e229bda5cb5059b6..67c8ddb31b61e81b25d5f80bff5d4a4bf88bc125 100644 (file)
--- a/feeds.conf.default
+++ b/feeds.conf.default
@@ -1,7 +1,12 @@
 src-svn packages svn://svn.openwrt.org/openwrt/packages
 src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/package
-src-svn luci http://svn2.luci.freifunk-halle.net/luci/branches/luci-0.9/contrib/package
+src-git luci git://nbd.name/luci.git
+src-git routing git://github.com/openwrt-routing/packages.git
+src-git telephony http://feeds.openwrt.nanl.de/openwrt/telephony.git
 #src-svn phone svn://svn.openwrt.org/openwrt/feeds/phone
 #src-svn efl svn://svn.openwrt.org/openwrt/feeds/efl
+#src-svn xorg svn://svn.openwrt.org/openwrt/feeds/xorg
 #src-svn desktop svn://svn.openwrt.org/openwrt/feeds/desktop
 #src-svn xfce svn://svn.openwrt.org/openwrt/feeds/xfce
+#src-svn lxde svn://svn.openwrt.org/openwrt/feeds/lxde
+#src-link custom /usr/src/openwrt/custom-feed