Skip to content

Commit

Permalink
Merge branch 'lede-17.01' of https://github.com/OnionIoT/source into …
Browse files Browse the repository at this point in the history
…lede-17.01
  • Loading branch information
greenbreakfast committed Sep 4, 2018
2 parents e3db9b8 + bf079e1 commit 91d6118
Showing 1 changed file with 8 additions and 20 deletions.
28 changes: 8 additions & 20 deletions .config
Original file line number Diff line number Diff line change
Expand Up @@ -3570,8 +3570,8 @@ CONFIG_PACKAGE_libpjsip-simple=m
CONFIG_PACKAGE_libpjsip-ua=m
CONFIG_PACKAGE_libpjsua=m
CONFIG_PACKAGE_libpjsua2=m
CONFIG_PACKAGE_libre=m
CONFIG_PACKAGE_librem=m
# CONFIG_PACKAGE_libre is not set
# CONFIG_PACKAGE_librem is not set
CONFIG_PACKAGE_libspandsp=m
CONFIG_PACKAGE_libsrtp=m

Expand Down Expand Up @@ -4263,6 +4263,7 @@ CONFIG_COOVACHILLI_NOSSL=y
# CONFIG_COOVACHILLI_CYASSL is not set
# CONFIG_COOVACHILLI_OPENSSL is not set
CONFIG_PACKAGE_nodogsplash=m
# CONFIG_PACKAGE_nodogsplash2 is not set
# CONFIG_PACKAGE_wifidog is not set
# CONFIG_PACKAGE_wifidog-tls is not set

Expand Down Expand Up @@ -4775,24 +4776,7 @@ CONFIG_PACKAGE_asterisk13-res-rtp-asterisk=m
# CONFIG_PACKAGE_asterisk13-res-xmpp is not set
# CONFIG_PACKAGE_asterisk13-sounds is not set
# CONFIG_PACKAGE_asterisk13-voicemail is not set
CONFIG_PACKAGE_baresip=m
CONFIG_PACKAGE_baresip-mod-alsa=m
# CONFIG_PACKAGE_baresip-mod-avcodec is not set
# CONFIG_PACKAGE_baresip-mod-avformat is not set
# CONFIG_PACKAGE_baresip-mod-cons is not set
# CONFIG_PACKAGE_baresip-mod-dtmfio is not set
# CONFIG_PACKAGE_baresip-mod-evdev is not set
CONFIG_PACKAGE_baresip-mod-g711=m
CONFIG_PACKAGE_baresip-mod-g722=m
# CONFIG_PACKAGE_baresip-mod-g726 is not set
# CONFIG_PACKAGE_baresip-mod-httpd is not set
# CONFIG_PACKAGE_baresip-mod-oss is not set
# CONFIG_PACKAGE_baresip-mod-speex is not set
# CONFIG_PACKAGE_baresip-mod-speex-aec is not set
# CONFIG_PACKAGE_baresip-mod-speex-pp is not set
# CONFIG_PACKAGE_baresip-mod-stdio is not set
# CONFIG_PACKAGE_baresip-mod-v4l is not set
# CONFIG_PACKAGE_baresip-mod-v4l2 is not set
# CONFIG_PACKAGE_baresip is not set
# CONFIG_PACKAGE_freeswitch is not set
# CONFIG_PACKAGE_kamailio4 is not set
# CONFIG_PACKAGE_miax is not set
Expand All @@ -4803,6 +4787,10 @@ CONFIG_PACKAGE_baresip-mod-g722=m
# CONFIG_PACKAGE_siproxd is not set
# CONFIG_PACKAGE_yate is not set

#
# Telephony Lantiq
#

#
# Time Synchronization
#
Expand Down

0 comments on commit 91d6118

Please sign in to comment.