Commit graph

9 commits

Author SHA1 Message Date
Ghislain MARY
3020dae1e8 Merge branch 'master' of git.linphone.org:linphone into belle-sip 2013-03-20 15:49:45 +01:00
Yann Diorcet
8dd4ee3ee2 Merge branch 'master' into belle-sip
Conflicts:
	build/android/common.mk
	coreapi/linphonecore.h
2013-03-12 13:30:13 +01:00
Jehan Monnier
dafc0c1f0c Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	configure.ac
	coreapi/linphonecore.h
2013-03-07 21:56:18 +01:00
Jehan Monnier
4842109900 remove contact as const char* from op->contact in case of bellesip 2013-03-07 18:44:14 +01:00
Jehan Monnier
33ebb44b85 fix build issue from wp8 build 2013-03-04 17:26:28 +01:00
Sylvain Berfini
5baaa9fc43 Fix merge + compil wp 2013-03-01 14:59:50 +01:00
Sylvain Berfini
5c30c2a318 Merge remote-tracking branch 'origin/belle-sip' into wp
Conflicts:
	coreapi/bellesip_sal/sal_impl.c
	coreapi/misc.c
	tester/call_tester.c
	tester/liblinphone_tester.c
2013-03-01 14:39:38 +01:00
Sylvain Berfini
ed4ef8a76c Added project for tester + more linphonecore exports 2013-02-28 16:27:20 +01:00
Sylvain Berfini
c3ebf99f5e Fix compilation for WP8 2013-02-27 17:28:15 +01:00