]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorJehan Monnier <jehan.monnier@linphone.org>
Thu, 10 Mar 2011 09:18:59 +0000 (10:18 +0100)
committerJehan Monnier <jehan.monnier@linphone.org>
Thu, 10 Mar 2011 09:18:59 +0000 (10:18 +0100)
1  2 
configure.ac

diff --cc configure.ac
Simple merge