]> sjero.net Git - linphone/commitdiff
Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone
authorSimon Morlat <simon.morlat@linphone.org>
Mon, 4 Apr 2011 13:26:56 +0000 (15:26 +0200)
committerSimon Morlat <simon.morlat@linphone.org>
Mon, 4 Apr 2011 13:26:56 +0000 (15:26 +0200)
1  2 
configure.ac

diff --cc configure.ac
Simple merge