Yann Diorcet 4da21ea4b0 Merge branch 'master' into belle-sip ... Conflicts: coreapi/linphonecore.h		2013-04-05 12:47:09 +02:00
..
android	Merge branch 'master' into belle-sip	2013-04-05 12:47:09 +02:00
macos	add libiconv patch and document it.	2013-03-15 11:28:44 +01:00
vsx	Enable disabling of verbose traces and improve traces display.	2013-03-22 11:28:48 +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