Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
liblinphone
Repository
liblinphone
build
android
Android.mk
Find file
Blame
History
Permalink
Merge branch 'master' into dev_vcard
· 1ed3fccf
Sylvain Berfini
authored
Feb 18, 2016
Conflicts: coreapi/friendlist.c java/common/org/linphone/core/LinphoneCore.java
1ed3fccf