Commit graph

7 commits

Author SHA1 Message Date
Jehan Monnier
1f9453fea6 Merge remote-tracking branch 'public/master' into belle-sip
Conflicts:
	.cproject
	.project
	Makefile.am
	configure.ac
	coreapi/Makefile.am
	coreapi/callbacks.c
	coreapi/linphonecore.c
2012-12-19 11:13:52 +01:00
Jehan Monnier
5273d7c70f better eclispe discovery 2012-07-17 18:58:34 +02:00
Jehan Monnier
19f236fa8f implement useragent 2012-05-11 17:15:20 +02:00
Jehan Monnier
9e6f05e470 first belle_sip implementation 2012-03-30 18:11:36 +02:00
Jehan Monnier
1335fca76b fix warning 2012-03-01 17:00:43 +01:00
Jehan Monnier
52ec4a646d fix .cprojet
update ms2 for better audio devices handling on macosx
2012-03-01 12:20:53 +01:00
Jehan Monnier
2c8ebd5dcf add liblinphone jni for java binding 2010-02-12 15:43:06 +01:00