diff options
author | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
---|---|---|
committer | Roman Yeryomin <roman@advem.lv> | 2013-05-26 01:02:55 +0300 |
commit | 342045a35b1981a89e4bc80842b10c065e1050da (patch) | |
tree | 4140720b20e8d641c11da882010d6130a75fef21 /feeds.conf.default | |
parent | 7338133dde8238afce34676214b494c8db96689b (diff) | |
parent | 1a116ce7818ecee5d167a9c0ebb1a0feca9120e6 (diff) |
Merge trunk into realtek-unstable
Conflicts:
Config.in
feeds.conf.default
package/base-files/files/etc/hotplug2-common.rules
package/network/config/netifd/files/etc/init.d/network
Diffstat (limited to 'feeds.conf.default')
-rw-r--r-- | feeds.conf.default | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/feeds.conf.default b/feeds.conf.default index 5fb9ed069..7b63a9ff8 100644 --- a/feeds.conf.default +++ b/feeds.conf.default @@ -1,7 +1,10 @@ src-svn packages svn://svn.openwrt.org/openwrt/packages src-svn xwrt http://x-wrt.googlecode.com/svn/trunk/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 luci http://svn.luci.subsignal.org/luci/trunk/contrib/package -src-svn luci http://nprove:nprovedev@fongui.wgaugsburg.de/luci/trunk/contrib/package +#src-svn luci http://nprove:nprovedev@fongui.wgaugsburg.de/luci/trunk/contrib/package #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 |