]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a00061 b10e731)
Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg/4.3
authorMathieu Rene <mrene@avgs.ca>
Fri, 27 Jul 2012 14:47:19 +0000 (10:47 -0400)
committerMathieu Rene <mrene@avgs.ca>
Fri, 27 Jul 2012 14:47:19 +0000 (10:47 -0400)
Conflicts:
src/mod/endpoints/mod_media_gateway/media_gateway_cmd_handler.c
src/mod/endpoints/mod_media_gateway/media_gateway_xml.c


Trivial merge
Mirror of https://github.com/signalwire/freeswitch.git