]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
fix conflict
authorMathieu Rene <mrene@avgs.ca>
Tue, 3 Jul 2012 16:28:13 +0000 (12:28 -0400)
committerMathieu Rene <mrene@avgs.ca>
Tue, 3 Jul 2012 16:28:13 +0000 (12:28 -0400)
commit1d5f9f9f8873a52cf540475193ede0efed66b117
treee4295e7cf4e8678323a897aad8ece204a85efbd0
parent92af41c0b317b10264cd8c20818e147971570207
parentc1bc9ac76d224f596aa6e3280fdc6b3b7eaa2d32
fix conflict
src/mod/endpoints/mod_media_gateway/media_gateway_xml.c
src/mod/endpoints/mod_media_gateway/mod_media_gateway.c