]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
fix conflict
authorMathieu Rene <mrene@avgs.ca>
Thu, 21 Jun 2012 14:40:57 +0000 (10:40 -0400)
committerMathieu Rene <mrene@avgs.ca>
Thu, 21 Jun 2012 14:40:57 +0000 (10:40 -0400)
commit294ab3880f6f303f2d658bb473eb0f3215cea9a5
treee2977dfcc33d656a7ee0080c1decc9a72ac8053e
parent79702bc0d2aa1fe4086c6108633181bf2d9a0a68
parent97d89de3fc5011168f7a5eb903316fb6d1221bed
fix conflict
src/mod/endpoints/mod_media_gateway/media_gateway_xml.c
src/mod/endpoints/mod_media_gateway/mod_media_gateway.c