]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into v1.6
authorKen Rice <krice@freeswitch.org>
Thu, 19 Nov 2015 19:55:18 +0000 (13:55 -0600)
committerKen Rice <krice@freeswitch.org>
Thu, 19 Nov 2015 19:55:18 +0000 (13:55 -0600)
1  2 
configure.ac

diff --cc configure.ac
Simple merge