linphone-iphone/coreapi/help
Pierre-Eric Pelloux-Prayer a99ea3b16c Merge remote-tracking branch 'origin/master' into dev_videoios
Conflicts:
	coreapi/linphonecall.c
	coreapi/linphonecore.c
	coreapi/proxy.c
	coreapi/sal.c
	coreapi/sal_eXosip2.c
	coreapi/sal_eXosip2.h
	java/common/org/linphone/core/LinphoneCall.java
	mediastreamer2
2011-08-16 12:07:50 +02:00
..
java/org/linphone/core/tutorials API and makefiles for ZRTP support. 2011-07-15 22:03:24 +02:00
buddy_status.c add proxy support to buddy_status tutorial 2010-12-03 10:02:29 +01:00
chatroom.c fix tutorial linphonecore.h includes 2010-11-16 08:57:47 +01:00
Doxyfile.in fix doxygen for building out of the source tree 2010-11-29 12:38:31 +01:00
doxygen.dox merge public branch 2011-07-11 19:04:30 +02:00
helloworld.c fix tutorial linphonecore.h includes 2010-11-16 08:57:47 +01:00
Makefile.am auto tools port for ios video 2011-07-13 10:29:59 +02:00
registration.c fix tutorial linphonecore.h includes 2010-11-16 08:57:47 +01:00