]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 656ecc1 c06a835)
Merge branch 'arnaldo.span_event_refactor'
authorArnaldo Pereira <arnaldo@sangoma.com>
Thu, 23 Dec 2010 23:14:35 +0000 (21:14 -0200)
committerArnaldo Pereira <arnaldo@sangoma.com>
Thu, 23 Dec 2010 23:14:35 +0000 (21:14 -0200)
Conflicts:

libs/freetdm/src/ftmod/ftmod_zt/ftmod_zt.c


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