Merge "Implement internal abstraction for iostreams"
authorJoshua Colp <jcolp@digium.com>
Thu, 17 Nov 2016 17:07:06 +0000 (11:07 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 17 Nov 2016 17:07:06 +0000 (11:07 -0600)
1  2 
channels/chan_sip.c
configure.ac
res/res_http_websocket.c

Simple merge
diff --cc configure.ac
Simple merge
Simple merge