]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4df2105 64c10e0)
Merge branch 'master' into v1.4
authorKen Rice <krice@freeswitch.org>
Thu, 12 Mar 2015 18:53:07 +0000 (13:53 -0500)
committerKen Rice <krice@freeswitch.org>
Thu, 12 Mar 2015 18:53:07 +0000 (13:53 -0500)
1  2 
configure.ac patch | diff1 | diff2 | blob | history
freeswitch.spec patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
diff --cc freeswitch.spec
Simple merge
Mirror of https://github.com/signalwire/freeswitch.git