-
Guillaume Beraudo authored
Merge branch 'dev_videomac' of git://git.linphone.org/mediastreamer2 into dev_videomac Conflicts: acinclude.m4
c02b03da
Merge branch 'dev_videomac' of git://git.linphone.org/mediastreamer2 into dev_videomac Conflicts: acinclude.m4