Guillaume Beraudo c991f420ec Merge branch 'master' of git.linphone.org:linphone ... Conflicts: configure.ac		2013-06-25 12:42:43 +02:00
..
android	Renamed liblinphonex86noneon to liblinphonex86	2013-05-15 10:50:30 +02:00
macos	add libiconv patch and document it.	2013-03-15 11:28:44 +01:00
openembedded	Add msx264 to the linphone-plugins bitbake recipe.	2013-05-22 17:05:32 +02: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