Sylvain Berfini 235dca249d Merge branch 'master' into dev_vcard ... Conflicts: build/android/Android.mk coreapi/private.h java/common/org/linphone/core/LinphoneCore.java java/impl/org/linphone/core/LinphoneCoreImpl.java		2016-02-09 10:21:18 +01:00
..
android	Merge branch 'master' into dev_vcard	2016-02-09 10:21:18 +01:00
macos	remove reference to oldphone.wav	2015-12-22 09:28:00 +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
windows10	Should fix the two vcard test not working yet on win32	2016-01-29 11:18:39 +01:00
wp8	Build account creator and xmlrpc on Android and WP8 + install header files.	2015-06-09 08:30:59 +02:00
Makefile.am	start implementing a macos bundle	2011-03-23 18:21:37 +01:00