Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

This commit is contained in:
Stephan Raue 2012-04-29 18:00:13 +02:00
commit 1dc0266bad

View File

@ -302,7 +302,7 @@ CONFIG_WHOAMI=y
# #
# Common options for ls, more and telnet # Common options for ls, more and telnet
# #
# CONFIG_FEATURE_AUTOWIDTH is not set CONFIG_FEATURE_AUTOWIDTH=y
# #
# Common options for df, du, ls # Common options for df, du, ls
@ -815,9 +815,9 @@ CONFIG_NSLOOKUP=y
CONFIG_ROUTE=y CONFIG_ROUTE=y
# CONFIG_SLATTACH is not set # CONFIG_SLATTACH is not set
# CONFIG_TCPSVD is not set # CONFIG_TCPSVD is not set
# CONFIG_TELNET is not set CONFIG_TELNET=y
# CONFIG_FEATURE_TELNET_TTYPE is not set CONFIG_FEATURE_TELNET_TTYPE=y
# CONFIG_FEATURE_TELNET_AUTOLOGIN is not set CONFIG_FEATURE_TELNET_AUTOLOGIN=y
# CONFIG_TELNETD is not set # CONFIG_TELNETD is not set
# CONFIG_FEATURE_TELNETD_STANDALONE is not set # CONFIG_FEATURE_TELNETD_STANDALONE is not set
# CONFIG_FEATURE_TELNETD_INETD_WAIT is not set # CONFIG_FEATURE_TELNETD_INETD_WAIT is not set