]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge branch 'smgmaster' into releases.3.4
authorMoises Silva <moy@sangoma.com>
Mon, 13 Jun 2011 18:18:23 +0000 (14:18 -0400)
committerMoises Silva <moy@sangoma.com>
Mon, 13 Jun 2011 18:18:23 +0000 (14:18 -0400)
commit5882e06f70611f9b494f2d2013e94cfb963977af
tree0402cf93ddc512932a903af81b546c84aa541542
parentd19d4b96abd381e033d5d6a9d9a7a556e0a6512b
parent401cef7479c3cacc01053074ed381d0993a2cd7c
Merge branch 'smgmaster' into releases.3.4

Conflicts:
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_support.c
src/include/switch_apr.h
src/switch.c
src/switch_apr.c