]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge pull request #546 in FS/freeswitch from ~COREY BURKE/freeswitch:feature/FS...
authorMike Jerris <mike@jerris.com>
Wed, 28 Oct 2015 00:13:25 +0000 (19:13 -0500)
committerMike Jerris <mike@jerris.com>
Wed, 28 Oct 2015 00:13:25 +0000 (19:13 -0500)
* commit '0316fdfcf1d2a72d1bad5dc9646371159173f93f':
  FS-8281: Expose SRTP and SRTCP crypto keys as channel vars

1  2 
src/switch_core.c
src/switch_rtp.c

Simple merge
Simple merge