-
Sandrine Avakian authored
# 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
623dc72e