Gautier Pelloux-Prayer ceb8533cf9 Merge branch 'quality_reporting' ... Conflicts: coreapi/linphonecall.c mediastreamer2 tester/call_tester.c		2014-04-22 14:42:20 +02:00
..
sal	Merge branch 'quality_reporting'	2014-04-22 14:42:20 +02:00
Makefile.am	add missing makedile file	2013-08-20 16:58:17 +02:00