Yann Diorcet 8dd4ee3ee2 Merge branch 'master' into belle-sip ... Conflicts: build/android/common.mk coreapi/linphonecore.h		2013-03-12 13:30:13 +01:00
..
android	Merge branch 'master' into belle-sip	2013-03-12 13:30:13 +01:00
macos	fix for new version of pango in macports.	2013-03-06 16:47:48 +01:00
vsx	Added linphonerc for early media test	2013-03-11 16:45:01 +01:00
wince	purge out p2pproxy	2010-01-20 15:44:30 +01:00
Makefile.am	start implementing a macos bundle	2011-03-23 18:21:37 +01:00