]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7422482 8fa947a)
Merge pull request #737 in FS/freeswitch from ~CARLOSP/freeswitch:bugfix/FS-8910...
authorAnthony Minessale II <anthony.minessale@gmail.com>
Wed, 9 Mar 2016 06:40:38 +0000 (00:40 -0600)
committerAnthony Minessale II <anthony.minessale@gmail.com>
Wed, 9 Mar 2016 06:40:38 +0000 (00:40 -0600)
* commit '8fa947aa19a9c6e202ab644975be39b966f6201c':
  FS-8910: Properly negotiate SDES when receiving SDP with a=crypto:0

1  2 
src/include/switch_core_media.h patch | diff1 | diff2 | blob | history
src/switch_core_media.c patch | diff1 | diff2 | blob | history

diff --cc src/include/switch_core_media.h
Simple merge
diff --cc src/switch_core_media.c
Simple merge
Mirror of https://github.com/signalwire/freeswitch.git