Sandrine Avakian 623dc72e1f Merge branch '3.10.x' ... # Conflicts: # CMakeLists.txt # coreapi/account_creator.c # coreapi/friendlist.c # coreapi/linphonecore_jni.cc # coreapi/misc.c # coreapi/vcard.cc # coreapi/vcard.h # coreapi/vcard_stubs.c # gtk/videowindow.c # java/common/org/linphone/core/LinphoneNatPolicy.java # java/impl/org/linphone/core/LinphoneNatPolicyImpl.java # mediastreamer2 # tester/vcard_tester.c		2016-08-25 17:52:12 +02:00
..
apixml2python	license: update FSF address	2016-07-27 11:58:38 +02:00
doc	Revert "Revert "Version 3.10.0""	2016-08-11 11:37:18 +02:00
unittests	Increase timeout of tls_with_non_tls_server test.	2016-07-27 15:50:04 +02:00
.gitignore	Add .gitignore in python directory.	2014-07-09 17:28:50 +02:00
apixml2python.py	license: update FSF address	2016-07-27 11:58:38 +02:00
linphone-daemon.py	Import linphone Python module with "import linphone".	2014-08-18 16:12:05 +02:00