Jehan Monnier 406c3a1019 Merge remote-tracking branch 'origin/master' into dev_videoios ... Conflicts: coreapi/Makefile.am coreapi/linphonecore.c mediastreamer2		2011-09-14 16:16:44 +02:00
..
java/org/linphone/core/tutorials
buddy_status.c
chatroom.c
Doxyfile.in
doxygen.dox
helloworld.c
Makefile.am
registration.c