]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d95f63 a1f19d9)
Merge branch 'master' of git.freeswitch.org:freeswitch
authorBrian West <brian@freeswitch.org>
Tue, 17 Aug 2010 15:16:57 +0000 (10:16 -0500)
committerBrian West <brian@freeswitch.org>
Tue, 17 Aug 2010 15:16:57 +0000 (10:16 -0500)
1  2 
conf/dialplan/default.xml patch | diff1 | diff2 | blob | history

diff --cc conf/dialplan/default.xml
Simple merge
Mirror of https://github.com/signalwire/freeswitch.git