Jehan Monnier 5035992c64 Merge remote-tracking branch 'private/dev_lime' ... Conflicts: coreapi/linphonecall.c		2015-03-12 15:08:35 +01:00
..
android	Merge remote-tracking branch 'private/dev_lime'	2015-03-12 15:08:35 +01:00
macos	Possible fix for App Nap problem	2015-01-16 17:08:58 +01:00
redhat	Update README rpm	2014-04-04 11:30:03 +02:00
wince	purge out p2pproxy	2010-01-20 15:44:30 +01:00
wp8	Use false linphone_plugins_dir in wp8 to not load plugins twice	2015-02-18 14:21:37 +01:00
Makefile.am	start implementing a macos bundle	2011-03-23 18:21:37 +01:00