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
..
python	Merge branch '3.10.x'	2016-08-25 17:52:12 +02:00
auto_answer.c	license: update FSF address	2016-07-27 11:58:38 +02:00
CMakeLists.txt	license: update FSF address	2016-07-27 11:58:38 +02:00
genapixml.py	license: update FSF address	2016-07-27 11:58:38 +02:00
generator.cc	license: update FSF address	2016-07-27 11:58:38 +02:00
generator.hh	license: update FSF address	2016-07-27 11:58:38 +02:00
genwrappers.cc	license: update FSF address	2016-07-27 11:58:38 +02:00
lpc2xml_jni.cc	license: update FSF address	2016-07-27 11:58:38 +02:00
lpc2xml_test.c	license: update FSF address	2016-07-27 11:58:38 +02:00
lpconfig_items.py	Simple tool to list most of lp_config items (and their default values if possible)	2016-07-07 11:41:20 +02:00
lpsendmsg.c	license: update FSF address	2016-07-27 11:58:38 +02:00
Makefile.am	add lp-sendmsg tool, a new tool to send arbitrary SIP MESSAGE requests through a server.	2016-01-28 15:49:10 +01:00
my_jni.h	license: update FSF address	2016-07-27 11:58:38 +02:00
software-desc.cc	license: update FSF address	2016-07-27 11:58:38 +02:00
software-desc.hh	license: update FSF address	2016-07-27 11:58:38 +02:00
test_ecc.c	license: update FSF address	2016-07-27 11:58:38 +02:00
test_lsd.c	license: update FSF address	2016-07-27 11:58:38 +02:00
test_numbers.c	license: update FSF address	2016-07-27 11:58:38 +02:00
xml2lpc_jni.cc	license: update FSF address	2016-07-27 11:58:38 +02:00
xml2lpc_test.c	license: update FSF address	2016-07-27 11:58:38 +02:00