]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
projects / thirdparty / freeswitch.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e32f393 d9ba7fc)
Merge branch 'master' into v1.4
authorKen Rice <krice@freeswitch.org>
Wed, 27 May 2015 22:56:11 +0000 (17:56 -0500)
committerKen Rice <krice@freeswitch.org>
Wed, 27 May 2015 22:56:11 +0000 (17:56 -0500)
1  2 
freeswitch.spec patch | diff1 | diff2 | blob | history

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