]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c021d22 f917a72)
Merge pull request #620 in FS/freeswitch from feature/FS-8188 to master
authorAnthony Minessale II <anthony.minessale@gmail.com>
Fri, 4 Dec 2015 16:09:25 +0000 (10:09 -0600)
committerAnthony Minessale II <anthony.minessale@gmail.com>
Fri, 4 Dec 2015 16:09:25 +0000 (10:09 -0600)
* commit 'f917a72c8451416ed992d798cabddee0de5b9b5b':
  FS-8188 add park_after_early_bridge transfer_after_early_bridge variables

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

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