Yann Diorcet 93f5931bfb Merge branch 'master' of git.linphone.org:linphone into belle-sip ... Conflicts: build/android/common.mk build/android/config.h		2013-02-13 17:21:37 +01:00
..
android	Merge branch 'master' of git.linphone.org:linphone into belle-sip	2013-02-13 17:21:37 +01:00
macos	macos bundle improvement	2012-03-01 16:42:23 +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