Jehan Monnier a37ec3f5f3 Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone ... Conflicts: coreapi/linphonecore.h		2010-09-10 15:14:56 +02:00
..
android	Merge branch 'master' of git.savannah.nongnu.org:/srv/git/linphone	2010-09-10 15:14:56 +02:00
wince	purge out p2pproxy	2010-01-20 15:44:30 +01:00