Merge branch 'master' into dev_loc

This commit is contained in:
Sandrine Avakian 2017-04-04 14:54:04 +02:00
commit 3ce2f574a4
2 changed files with 1 additions and 1 deletions

View file

@ -81,6 +81,7 @@ liblinphone_la_SOURCES=\
ringtoneplayer.c \
sqlite3_bctbx_vfs.c sqlite3_bctbx_vfs.h\
factory.c \
payload_type.c \
$(GITVERSION_FILE)
if BUILD_UPNP

@ -1 +0,0 @@
Subproject commit 954652074fd168323c0846d6d8cd6c5b4d859d75