diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/Config.in | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/Config.in')
| -rw-r--r-- | package/Config.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package/Config.in b/package/Config.in index 87022ea21..3db9a7631 100644 --- a/package/Config.in +++ b/package/Config.in @@ -10,9 +10,10 @@ menu "Applications" menu "Basesystem" source "package/base-files/Config.in" source "package/busybox/Config.in" -source "package/uclibc/Config.in" source "package/cfgfs/Config.in" +source "package/uclibc/Config.in" source "package/glibc/Config.in" +source "package/libc/Config.in" endmenu menu "Bluetooth" @@ -205,7 +206,8 @@ menu "IPv6" depends ADK_IPV6 source "package/6tunnel/Config.in" source "package/aiccu/Config.in" -source "package/dhcp6/Config.in" +# timeb.h / dn_comp issues +#source "package/dhcpv6/Config.in" source "package/miredo/Config.in" source "package/mrd6/Config.in" source "package/ndisc/Config.in" @@ -230,7 +232,6 @@ source "package/ether-wake/Config.in" source "package/iproute2/Config.in" source "package/ipset/Config.in" source "package/iptables/Config.in" -source "package/iptables-snmp/Config.in" source "package/knock/Config.in" source "package/linux-atm/Config.in" source "package/macchanger/Config.in" @@ -338,7 +339,6 @@ source "package/chillispot/Config.in" source "package/hostapd/Config.in" source "package/iw/Config.in" #source "package/kismet/Config.in" -source "package/nocatsplash/Config.in" source "package/olsrd/Config.in" source "package/snort-wireless/Config.in" source "package/wifidog/Config.in" |