]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7e9c26 432de1c a8c20e2)
Merge commit 'v1.0.5.14226d2'; commit 'v1.0.6'
authorTravis Cross <tc@traviscross.com>
Wed, 7 Apr 2010 17:30:39 +0000 (17:30 +0000)
committerTravis Cross <tc@traviscross.com>
Wed, 7 Apr 2010 17:31:59 +0000 (17:31 +0000)
Merge made by -s ours


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